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

pastojs: filer: read inline specialize expr

Browse Source
This commit is contained in:
mattias 2020-12-03 09:49:12 +00:00
parent c15fe1bef2
commit cc7c15f35e
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/packages/pastojs/src/pas2jsfiler.pp
View File

@ -8334,17 +8334,18 @@ begin
if El.Params[i]=nil then
RaiseMsg(20200512232836,El,GetObjPath(El.DestType)+' Params['+IntToStr(i)+']=nil');
if not ReadInteger(Obj,'SpecType',SpecId,El) then
begin
if Obj.Find('SpecType')<>nil then
RaiseMsg(20201203092759,El,GetObjName(Obj.Find('SpecType')));
exit; // generic reference to a generic
end;
// El.Data TPasSpecializeTypeData
Data:=TPasSpecializeTypeData.Create;
// add to free list
Resolver.AddResolveData(El,Data,lkModule);
if not ReadInteger(Obj,'SpecType',SpecId,El) then
begin
if Obj.Find('SpecType')=nil then
RaiseMsg(20201203092759,El,GetObjName(Obj.Find('SpecType')));
end;
PromiseSetElReference(SpecId,@Set_SpecializeTypeData,Data,El);
// check old specialized name
@ -8366,6 +8367,7 @@ procedure TPCUReader.ReadInlineSpecializeExpr(Obj: TJSONObject;
var
Parent: TPasElement;
begin
ReadPasElement(Obj,Expr,aContext);
Expr.Kind:=pekSpecialize;
Expr.NameExpr:=ReadExpr(Obj,Expr,'SpecName',aContext);
ReadElementList(Obj,Expr,'SpecParams',Expr.Params,

24
compiler/packages/pastojs/tests/tcfiler.pas
View File

@ -233,6 +233,7 @@ type
procedure TestPC_Constraints;
// ToDo: constraints
// ToDo: unit impl declarations used by generics
procedure TestPC_GenericClass_InlineSpecialize;
procedure TestPC_UseUnit;
procedure TestPC_UseUnit_Class;
@ -3530,6 +3531,29 @@ begin
WriteReadUnit;
end;
procedure TTestPrecompile.TestPC_GenericClass_InlineSpecialize;
begin
StartUnit(true,[supTObject]);
Add([
'{$mode delphi}',
'interface',
'type',
' TBird<T: class> = class',
' end;',
' TEagle<T: class> = class(TBird<T>)',
' type',
' TMyEagle = TEagle<T>;',
' function Fly(v: T): T;',
' end;',
'implementation',
'function TEagle<T>.Fly(v: T): T;',
'begin',
' TEagle<T>.Create;',
'end;',
'']);
WriteReadUnit;
end;
procedure TTestPrecompile.TestPC_UseUnit;
begin
AddModuleWithIntfImplSrc('unit2.pp',