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

pgenutil.pas, parse_generic_specialization_types_internal:

Browse Source 
* in case of an inline specialization inside a generic function's/method's parameter list using type parameters of the generic function/method itself fulltypename of the generic type parameter must not be used as the procdef is not yet owned by anyone; this is no problem for non-generic functions/methods or specializations with type parameters that don't belong to the generic function/method, because they don't have the generic, ownerless procdef as owner => use a name that provides sufficient uniqueness

git-svn-id: trunk@31601 -
This commit is contained in:
svenbarth 2015-09-11 15:18:44 +00:00
parent 5a77040787
commit 00f776ef76
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compiler/pgenutil.pas
View File

@ -288,6 +288,8 @@ uses
typeparam : tnode;
parampos : pfileposinfo;
tmpparampos : tfileposinfo;
namepart : string;
prettynamepart : ansistring;
begin
result:=true;
if genericdeflist=nil then
@ -345,10 +347,25 @@ uses
else
begin
{ we use the full name of the type to uniquely identify it }
specializename:=specializename+'$'+typeparam.resultdef.fulltypename;
if (symtablestack.top.symtabletype=parasymtable) and
(typeparam.resultdef.owner=symtablestack.top) then
begin
{ special handling for specializations inside generic function declarations }
if symtablestack.top.defowner.typ<>procdef then
internalerror(2015080101);
str(symtablestack.top.defowner.defid,namepart);
namepart:='genproc'+namepart+'_'+tdef(symtablestack.top.defowner).fullownerhierarchyname+'_'+tprocdef(symtablestack.top.defowner).procsym.realname+'_'+typeparam.resultdef.typename;
prettynamepart:=tdef(symtablestack.top.defowner).fullownerhierarchyname+tprocdef(symtablestack.top.defowner).procsym.prettyname;
end
else
begin
namepart:=typeparam.resultdef.fulltypename;
prettynamepart:=typeparam.resultdef.fullownerhierarchyname;
end;
specializename:=specializename+'$'+namepart;
if not first then
prettyname:=prettyname+',';
prettyname:=prettyname+typeparam.resultdef.fullownerhierarchyname+typeparam.resultdef.typesym.prettyname;
prettyname:=prettyname+prettynamepart+typeparam.resultdef.typesym.prettyname;
end;
end
else