paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-04-07 11:07:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

rtl: MethodName: support callbacks with function reference

Browse Source
This commit is contained in:
mattias 2019-10-21 17:05:49 +00:00
parent a72e7bf311
commit c79684f8d9
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
packages/rtl/typinfo.pas
View File

@ -1396,14 +1396,26 @@ end;
function GetMethodProp(Instance: TObject; PropInfo: TTypeMemberProperty
): TMethod;
var
v: JSValue;
v, fn: JSValue;
begin
Result.Code:=nil;
Result.Data:=nil;
v:=GetJSValueProp(Instance,PropInfo);
if not isFunction(v) then exit;
Result.Data:=Pointer(TJSObject(v)['scope']);
Result.Code:=CodePointer(TJSObject(v)['fn']);
fn:=TJSObject(v)['fn'];
if isString(fn) then
begin
if Result.Data<>nil then
// named callback
Result.Code:=CodePointer(TJSObject(Result.Data)[String(fn)])
else
// this is not an rtl callback, return the value
Result.Code:=CodePointer(v);
end
else
// anonymous callback
Result.Code:=CodePointer(fn);
end;
function GetMethodProp(Instance: TObject; const PropName: string): TMethod;
@ -1411,26 +1423,35 @@ begin
Result:=GetMethodProp(Instance,FindPropInfo(Instance,PropName));
end;
function createCallback(scope: Pointer; fn: CodePointer): TJSFunction; external name 'rtl.createCallback';
function createCallbackPtr(scope: Pointer; fn: CodePointer): TJSFunction; external name 'rtl.createCallback';
function createCallbackStr(scope: Pointer; fn: string): TJSFunction; external name 'rtl.createCallback';
procedure SetMethodProp(Instance: TObject; PropInfo: TTypeMemberProperty;
const Value: TMethod);
var
cb: TJSFunction;
Code: Pointer;
begin
// Note: Value.Data=nil is allowed and can be used by designer code
if Value.Code=nil then
Code:=Value.Code;
if Code=nil then
cb:=nil
else if isFunction(Value.Code)
and (TJSObject(Value.Code)['scope']=Value.Data)
and (isFunction(TJSObject(Value.Code)['fn']) or isString(TJSObject(Value.Code)['fn']))
then
else if isFunction(Code) then
begin
// Value.Code is already a callback
cb:=TJSFunction(Value.Code);
if (TJSObject(Code)['scope']=Value.Data)
and (isFunction(TJSObject(Code)['fn']) or isString(TJSObject(Code)['fn']))
then
begin
// Value.Code is already the needed callback
cb:=TJSFunction(Code);
end
else if isString(TJSObject(Code)['fn']) then
// named callback, different scope
cb:=createCallbackStr(Value.Data,string(TJSObject(Code)['fn']));
end
else
cb:=createCallback(Value.Data,Value.Code);
// not a valid value -> for compatibility set it anyway
cb:=createCallbackPtr(Value.Data,Code);
SetJSValueProp(Instance,PropInfo,cb);
end;