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

pastojs: read old pcu files from 2.0.0

Browse Source 
git-svn-id: trunk@48907 -
(cherry picked from commit fc6769329f)
This commit is contained in:
Mattias Gaertner 2021-03-08 12:01:28 +00:00 committed by Florian Klämpfl
parent 494263cf7c
commit b1a3184cc8
1 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
packages/pastojs/src/fppas2js.pp
View File

@ -2159,6 +2159,7 @@ type
AContext: TConvertContext): TJSElement; virtual; AContext: TConvertContext): TJSElement; virtual;
Function CreateRTTIMemberProperty(Members: TFPList; Index: integer; Function CreateRTTIMemberProperty(Members: TFPList; Index: integer;
AContext: TConvertContext): TJSElement; virtual; AContext: TConvertContext): TJSElement; virtual;
Procedure CreateRTTIAnonymous(El: TPasType; AContext: TConvertContext); virtual; // needed by precompiled files from 2.0.0
Function CreateRTTIMembers(El: TPasMembersType; Src: TJSSourceElements; Function CreateRTTIMembers(El: TPasMembersType; Src: TJSSourceElements;
FuncContext: TFunctionContext; MembersSrc: TJSSourceElements; FuncContext: TFunctionContext; MembersSrc: TJSSourceElements;
MembersFuncContext: TFunctionContext; RTTIExpr: TJSElement; MembersFuncContext: TFunctionContext; RTTIExpr: TJSElement;
@ -19963,6 +19964,23 @@ var
ObjLit.Expr:=JS; ObjLit.Expr:=JS;
end; end;
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;
@ -19975,7 +19993,10 @@ begin
V:=TPasVariable(Members[Index]); V:=TPasVariable(Members[Index]);
VarType:=V.VarType; VarType:=V.VarType;
if (VarType<>nil) and (VarType.Name='') then if (VarType<>nil) and (VarType.Name='') then
RaiseNotSupported(VarType,AContext,20210223022919); begin
if not VarTypeInfoAlreadyCreated(VarType) then
CreateRTTIAnonymous(VarType,AContext); // only needed by precompiled files from 2.0.0
end;
JSTypeInfo:=CreateTypeInfoRef(VarType,AContext,V); JSTypeInfo:=CreateTypeInfoRef(VarType,AContext,V);
OptionsEl:=nil; OptionsEl:=nil;
@ -20293,6 +20314,37 @@ begin
end; end;
end; end;
procedure TPasToJSConverter.CreateRTTIAnonymous(El: TPasType;
AContext: TConvertContext);
// if El has any anonymous types, create the RTTI
var
C: TClass;
JS: TJSElement;
GlobalCtx: TFunctionContext;
Src: TJSSourceElements;
begin
if El.Name<>'' then
RaiseNotSupported(El,AContext,20170905162324,'inconsistency');
GlobalCtx:=AContext.GetGlobalFunc;
if GlobalCtx=nil then
RaiseNotSupported(El,AContext,20181229130835);
if not (GlobalCtx.JSElement is TJSSourceElements) then
begin
{$IFDEF VerbosePas2JS}
writeln('TPasToJSConverter.CreateRTTIAnonymous GlobalCtx=',GetObjName(GlobalCtx),' JSElement=',GetObjName(GlobalCtx.JSElement));
{$ENDIF}
RaiseNotSupported(El,AContext,20181229130926);
end;
Src:=TJSSourceElements(GlobalCtx.JSElement);
C:=El.ClassType;
if C=TPasArrayType then
begin
JS:=ConvertArrayType(TPasArrayType(El),AContext);
AddToSourceElements(Src,JS);
end;
end;
function TPasToJSConverter.CreateRTTIMembers(El: TPasMembersType; function TPasToJSConverter.CreateRTTIMembers(El: TPasMembersType;
Src: TJSSourceElements; FuncContext: TFunctionContext; Src: TJSSourceElements; FuncContext: TFunctionContext;
MembersSrc: TJSSourceElements; MembersFuncContext: TFunctionContext; MembersSrc: TJSSourceElements; MembersFuncContext: TFunctionContext;