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

pastojs: override specialize name

Browse Source 
git-svn-id: trunk@46787 -
(cherry picked from commit 43aa4c6b40)
This commit is contained in:
Mattias Gaertner 2020-09-06 09:06:30 +00:00 committed by Florian Klämpfl
parent cf57cce1d3
commit 7b2d84ab42
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1512,6 +1512,7 @@ type
function GenerateGUID(El: TPasClassType): string; virtual; function GenerateGUID(El: TPasClassType): string; virtual;
protected protected
// generic/specialize // generic/specialize
function CreateSpecializedTypeName(Item: TPRSpecializedItem): string; override;
procedure SpecializeGenericIntf(SpecializedItem: TPRSpecializedItem); procedure SpecializeGenericIntf(SpecializedItem: TPRSpecializedItem);
override; override;
procedure SpecializeGenericImpl(SpecializedItem: TPRSpecializedItem); procedure SpecializeGenericImpl(SpecializedItem: TPRSpecializedItem);
@ -4976,6 +4977,11 @@ begin
Result:=Result+'}'; Result:=Result+'}';
end; end;
function TPas2JSResolver.CreateSpecializedTypeName(Item: TPRSpecializedItem): string;
begin
Result:=Item.GenericEl.Name+'$G'+IntToStr(Item.Index+1);
end;
procedure TPas2JSResolver.SpecializeGenericIntf( procedure TPas2JSResolver.SpecializeGenericIntf(
SpecializedItem: TPRSpecializedItem); SpecializedItem: TPRSpecializedItem);
{$IFDEF EnableLongNames} {$IFDEF EnableLongNames}

2
packages/pastojs/tests/tcgenerics.pas
View File

@ -870,7 +870,7 @@ begin
LinesToStr([ // $mod.$main LinesToStr([ // $mod.$main
'$mod.w = $mod.c;', '$mod.w = $mod.c;',
''])); '']));
CheckHint(mtWarning,nClassTypesAreNotRelatedXY,'Class types "TBird$G2<Char>" and "TBird$G1<Word>" are not related'); CheckHint(mtWarning,nClassTypesAreNotRelatedXY,'Class types "TBird$G2" and "TBird$G1" are not related');
CheckResolverUnexpectedHints(); CheckResolverUnexpectedHints();
end; end;