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

pastojs: fixed attributes of indirectly used class

Browse Source
This commit is contained in:
mattias 2021-03-07 12:48:43 +00:00
parent 405757a04a
commit b04ce38c78
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/packages/fcl-passrc/src/pasuseanalyzer.pas
View File

@ -262,7 +262,7 @@ type
procedure UseElement(El: TPasElement; Access: TResolvedRefAccess;
UseFull: boolean); virtual;
procedure UseTypeInfo(El: TPasElement); virtual;
procedure UseAttributes(El: TPasElement); virtual;
function UseAttributes(El: TPasElement): boolean; virtual;
function UseModule(aModule: TPasModule; Mode: TPAUseMode): boolean; virtual;
procedure UseSection(Section: TPasSection; Mode: TPAUseMode); virtual;
procedure UseImplBlock(Block: TPasImplBlock; Mark: boolean); virtual;
@ -1322,12 +1322,13 @@ begin
UseTypeInfo(El.Parent);
end;
procedure TPasAnalyzer.UseAttributes(El: TPasElement);
function TPasAnalyzer.UseAttributes(El: TPasElement): boolean;
var
Calls: TPasExprArray;
i: Integer;
begin
Calls:=Resolver.GetAttributeCallsEl(El);
Result:=Calls<>nil;
for i:=0 to length(Calls)-1 do
UseExpr(Calls[i]);
end;
@ -2412,7 +2413,9 @@ begin
end;
end;
UseAttributes(El);
if UseAttributes(El) and (El.ClassType=TPasClassType) then
UseTypeInfo(El); // class with attributes,
// typeinfo can be used at runtime via typeinfo(aClass) -> always mark
end;
procedure TPasAnalyzer.UseClassConstructor(El: TPasMembersType);

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

@ -15526,11 +15526,11 @@ begin
RaiseNotSupported(El,AContext,20170927183645);
if El.Parent is TProcedureBody then
RaiseNotSupported(El,AContext,20181231004355);
if not aResolver.IsFullySpecialized(El) then exit;
if El.IsForward then
exit(ConvertClassForwardType(El,AContext))
else if El.IsExternal then
exit(ConvertExtClassType(El,AContext));
if not aResolver.IsFullySpecialized(El) then exit;
if El.CustomData is TPas2JSClassScope then
begin

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

@ -31747,6 +31747,9 @@ begin
' [TCustom(1)]',
' TMyClass = class',
' end;',
' [TCustom(11)]',
' TMyDescendant = class(TMyClass)',
' end;',
' [TCustom(2)]',
' TRec = record',
' end;',
@ -31779,6 +31782,10 @@ begin
' var $r = this.$rtti;',
' $r.attr = [$mod.TCustomAttribute, "Create", [1]];',
'});',
'rtl.createClass(this, "TMyDescendant", this.TMyClass, function () {',
' var $r = this.$rtti;',
' $r.attr = [$mod.TCustomAttribute, "Create", [11]];',
'});',
'rtl.recNewT(this, "TRec", function () {',
' this.$eq = function (b) {',
' return true;',