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

Add name of unit for return type if not from current module in tprocdef.customprocname

Browse Source
This commit is contained in:
Pierre Muller 2022-09-20 22:53:37 +02:00
parent 9c7d1515bf
commit 2187bfaddd
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/symdef.pas
View File

@ -6772,8 +6772,9 @@ implementation
function tprocdef.customprocname(pno: tprocnameoptions):ansistring; function tprocdef.customprocname(pno: tprocnameoptions):ansistring;
var var
s, rn : ansistring; s, hs, rn : ansistring;
t : ttoken; t : ttoken;
module : tmodule;
syssym : tsyssym; syssym : tsyssym;
begin begin
{$ifdef EXTDEBUG} {$ifdef EXTDEBUG}
@ -6850,7 +6851,23 @@ implementation
potype_class_constructor,potype_class_destructor]) and potype_class_constructor,potype_class_destructor]) and
assigned(returndef) and assigned(returndef) and
not(is_void(returndef)) then not(is_void(returndef)) then
s:=s+':'+returndef.GetTypeName; begin
if assigned(returndef.typesym) then
begin
module:=find_module_from_symtable(returndef.typesym.owner);
if module <> current_module then
s:=s+':'+module.realmodulename^+'.'
else
s:=s+':';
hs:=returndef.typesym.realname;
if hs[1]<>'$' then
s:=s+returndef.OwnerHierarchyName+hs
else
s:=s+returndef.GetTypeName;
end
else
s:=s+':'+returndef.GetTypeName;
end;
if not (po_anonymous in procoptions) then if not (po_anonymous in procoptions) then
if assigned(owner) and (owner.symtabletype=localsymtable) then if assigned(owner) and (owner.symtabletype=localsymtable) then
s:=s+' is nested' s:=s+' is nested'