paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-08-23 09:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

pas2js: fixed rtti record field anonymous array

Browse Source
This commit is contained in:
mattias 2020-06-03 13:27:21 +00:00
parent c07791757c
commit 871e01ca66
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
compiler/packages/pastojs/src/fppas2js.pp
View File

@ -16772,15 +16772,37 @@ function TPasToJSConverter.CreateRTTIMemberField(V: TPasVariable;
// create $r.addField("varname",typeinfo); // create $r.addField("varname",typeinfo);
var var
Call: TJSCallExpression; Call: TJSCallExpression;
function VarTypeInfoAlreadyCreated(VarType: TPasType): boolean;
var
i: Integer;
PrevMember: TPasElement;
begin
i:=Index-1;
while (i>=0) do
begin
PrevMember:=TPasElement(Members[i]);
if (PrevMember is TPasVariable) and (TPasVariable(PrevMember).VarType=VarType)
and IsElementUsed(PrevMember) then
exit(true);
dec(i);
end;
Result:=false;
end;
var var
JSTypeInfo: TJSElement; JSTypeInfo: TJSElement;
aName: String; aName: String;
VarType: TPasType;
begin begin
Result:=nil; Result:=nil;
if (V.VarType<>nil) and (V.VarType.Name='') then VarType:=V.VarType;
CreateRTTIAnonymous(V.VarType,AContext); if (VarType<>nil) and (VarType.Name='') then
begin
if not VarTypeInfoAlreadyCreated(VarType) then
CreateRTTIAnonymous(VarType,AContext);
end;
JSTypeInfo:=CreateTypeInfoRef(V.VarType,AContext,V); JSTypeInfo:=CreateTypeInfoRef(VarType,AContext,V);
// Note: create JSTypeInfo first, it may raise an exception // Note: create JSTypeInfo first, it may raise an exception
Call:=CreateCallExpression(V); Call:=CreateCallExpression(V);
// $r.addField // $r.addField

17
compiler/packages/pastojs/tests/tcmodules.pas
View File

@ -27496,6 +27496,7 @@ begin
Add(' VarShI: shortint;'); Add(' VarShI: shortint;');
Add(' VarBy: byte;'); Add(' VarBy: byte;');
Add(' VarExt: longint external name ''VarExt'';'); Add(' VarExt: longint external name ''VarExt'';');
Add(' ArrA, ArrB: array of byte;');
Add(' end;'); Add(' end;');
Add('var p: pointer;'); Add('var p: pointer;');
Add(' Obj: tobject;'); Add(' Obj: tobject;');
@ -27519,8 +27520,12 @@ begin
' this.VarW = 0;', ' this.VarW = 0;',
' this.VarShI = 0;', ' this.VarShI = 0;',
' this.VarBy = 0;', ' this.VarBy = 0;',
' this.ArrA = [];',
' this.ArrB = [];',
' };', ' };',
' this.$final = function () {', ' this.$final = function () {',
' this.ArrA = undefined;',
' this.ArrB = undefined;',
' };', ' };',
' var $r = this.$rtti;', ' var $r = this.$rtti;',
' $r.addField("VarLI", rtl.longint);', ' $r.addField("VarLI", rtl.longint);',
@ -27534,6 +27539,11 @@ begin
' $r.addField("VarShI", rtl.shortint);', ' $r.addField("VarShI", rtl.shortint);',
' $r.addField("VarBy", rtl.byte);', ' $r.addField("VarBy", rtl.byte);',
' $r.addField("VarExt", rtl.longint);', ' $r.addField("VarExt", rtl.longint);',
' $mod.$rtti.$DynArray("TObject.ArrB$a", {',
' eltype: rtl.byte',
' });',
' $r.addField("ArrA", $mod.$rtti["TObject.ArrB$a"]);',
' $r.addField("ArrB", $mod.$rtti["TObject.ArrB$a"]);',
'});', '});',
'this.p = null;', 'this.p = null;',
'this.Obj = null;', 'this.Obj = null;',
@ -28553,7 +28563,7 @@ begin
StartProgram(false); StartProgram(false);
Add('type'); Add('type');
Add(' TFloatRec = record'); Add(' TFloatRec = record');
Add(' d: array of char;'); Add(' c,d: array of char;');
// Add(' i: array of array of longint;'); // Add(' i: array of array of longint;');
Add(' end;'); Add(' end;');
Add('var p: pointer;'); Add('var p: pointer;');
@ -28566,11 +28576,13 @@ begin
CheckSource('TestRTTI_Record', CheckSource('TestRTTI_Record',
LinesToStr([ // statements LinesToStr([ // statements
'rtl.recNewT($mod, "TFloatRec", function () {', 'rtl.recNewT($mod, "TFloatRec", function () {',
' this.c = [];',
' this.d = [];', ' this.d = [];',
' this.$eq = function (b) {', ' this.$eq = function (b) {',
' return this.d === b.d;', ' return (this.c === b.c) && (this.d === b.d);',
' };', ' };',
' this.$assign = function (s) {', ' this.$assign = function (s) {',
' this.c = s.c;',
' this.d = s.d;', ' this.d = s.d;',
' return this;', ' return this;',
' };', ' };',
@ -28578,6 +28590,7 @@ begin
' eltype: rtl.char', ' eltype: rtl.char',
' });', ' });',
' var $r = $mod.$rtti.$Record("TFloatRec", {});', ' var $r = $mod.$rtti.$Record("TFloatRec", {});',
' $r.addField("c", $mod.$rtti["TFloatRec.d$a"]);',
' $r.addField("d", $mod.$rtti["TFloatRec.d$a"]);', ' $r.addField("d", $mod.$rtti["TFloatRec.d$a"]);',
'});', '});',
'this.p = null;', 'this.p = null;',