paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 06:29:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

pastojs: type helper for jsvalue

Browse Source 
git-svn-id: trunk@43032 -
This commit is contained in:
Mattias Gaertner 2019-09-18 15:46:49 +00:00
parent 1145d0d18a
commit c769b8dc7d
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/fcl-passrc/src/pasresolver.pp
View File

@ -10154,7 +10154,8 @@ begin
end; end;
// default: search for type helpers // default: search for type helpers
if (LeftResolved.BaseType in btAllStandardTypes) if (LeftResolved.BaseType in btAllStandardTypes)
or (LeftResolved.BaseType=btContext) then or (LeftResolved.BaseType=btContext)
or (LeftResolved.BaseType=btCustom) then
begin begin
if SearchInTypeHelpers(LeftResolved.HiTypeEl,LeftResolved.IdentEl) then exit; if SearchInTypeHelpers(LeftResolved.HiTypeEl,LeftResolved.IdentEl) then exit;
end end

65
packages/pastojs/tests/tcmodules.pas
View File

@ -689,6 +689,7 @@ type
Procedure TestTypeHelper_Word; Procedure TestTypeHelper_Word;
Procedure TestTypeHelper_Double; Procedure TestTypeHelper_Double;
Procedure TestTypeHelper_StringChar; Procedure TestTypeHelper_StringChar;
Procedure TestTypeHelper_JSValue;
Procedure TestTypeHelper_Array; Procedure TestTypeHelper_Array;
Procedure TestTypeHelper_EnumType; Procedure TestTypeHelper_EnumType;
Procedure TestTypeHelper_SetType; Procedure TestTypeHelper_SetType;
@ -23530,6 +23531,70 @@ begin
''])); '']));
end; end;
procedure TTestModule.TestTypeHelper_JSValue;
begin
StartProgram(false);
Add([
'{$modeswitch typehelpers}',
'type',
' TExtValue = type jsvalue;',
' THelper = type helper for TExtValue',
' function ToStr: String;',
' end;',
'function THelper.ToStr: String;',
'begin',
'end;',
'var',
' s: string;',
' v: TExtValue;',
'begin',
' s:=v.toStr;',
' s:=v.toStr();',
' TExtValue(s).toStr;',
'']);
ConvertProgram;
CheckSource('TestTypeHelper_JSValue',
LinesToStr([ // statements
'rtl.createHelper($mod, "THelper", null, function () {',
' this.ToStr = function () {',
' var Result = "";',
' return Result;',
' };',
'});',
'this.s = "";',
'this.v = undefined;',
'']),
LinesToStr([ // $mod.$main
'$mod.s = $mod.THelper.ToStr.call({',
' p: $mod,',
' get: function () {',
' return this.p.v;',
' },',
' set: function (v) {',
' this.p.v = v;',
' }',
'});',
'$mod.s = $mod.THelper.ToStr.call({',
' p: $mod,',
' get: function () {',
' return this.p.v;',
' },',
' set: function (v) {',
' this.p.v = v;',
' }',
'});',
'$mod.THelper.ToStr.call({',
' p: $mod,',
' get: function () {',
' return this.p.s;',
' },',
' set: function (v) {',
' rtl.raiseE("EPropReadOnly");',
' }',
'});',
'']));
end;
procedure TTestModule.TestTypeHelper_Array; procedure TTestModule.TestTypeHelper_Array;
begin begin
StartProgram(false); StartProgram(false);