diff --git a/compiler/ncal.pas b/compiler/ncal.pas index 4ed6cbea2e..87b5d7de7a 100644 --- a/compiler/ncal.pas +++ b/compiler/ncal.pas @@ -3397,7 +3397,7 @@ implementation pd:=tprocdef(AbstractMethodsList[i]); if po_abstractmethod in pd.procoptions then begin - Message2(type_w_instance_with_abstract,objectdf.objrealname^,pd.procsym.RealName); + Message2(type_w_instance_with_abstract,objectdf.typesymbolprettyname,pd.customprocname([pno_proctypeoption, pno_paranames,pno_ownername, pno_noclassmarker, pno_prettynames])); MessagePos1(pd.fileinfo,sym_h_abstract_method_list,pd.fullprocname(true)); end; end; @@ -4608,7 +4608,7 @@ implementation (procdefinition.typ=procdef) and not (pio_inline_not_possible in tprocdef(procdefinition).implprocoptions) then begin - Message1(cg_n_no_inline,tprocdef(procdefinition).customprocname([pno_proctypeoption, pno_paranames,pno_ownername, pno_noclassmarker])); + Message1(cg_n_no_inline,tprocdef(procdefinition).customprocname([pno_proctypeoption, pno_paranames,pno_ownername, pno_noclassmarker, pno_prettynames])); end; mark_unregable_parameters; result:=pass1_normal; diff --git a/compiler/symdef.pas b/compiler/symdef.pas index 8b43927213..651a015f43 100644 --- a/compiler/symdef.pas +++ b/compiler/symdef.pas @@ -658,7 +658,7 @@ interface tprocnameoption = (pno_showhidden, pno_proctypeoption, pno_paranames, pno_ownername, pno_noclassmarker, pno_noleadingdollar, - pno_mangledname, pno_noparams); + pno_mangledname, pno_noparams, pno_prettynames); tprocnameoptions = set of tprocnameoption; tproccopytyp = (pc_normal, {$ifdef i8086} @@ -6853,8 +6853,10 @@ implementation else s:=s+'procedure'; end + else if pno_prettynames in pno then + rn:=procsym.prettyname else - rn:=procsym.realname; + rn:=procsym.RealName; if (pno_noleadingdollar in pno) and (rn[1]='$') then delete(rn,1,1); @@ -6874,7 +6876,10 @@ implementation s:=s+':'+module.realmodulename^+'.' else s:=s+':'; - hs:=returndef.typesym.realname; + if pno_prettynames in pno then + hs:=returndef.typesym.prettyname + else + hs:=returndef.typesym.realname; if hs[1]<>'$' then s:=s+returndef.OwnerHierarchyName+hs else diff --git a/compiler/symtype.pas b/compiler/symtype.pas index 653ea14e35..762167e2c8 100644 --- a/compiler/symtype.pas +++ b/compiler/symtype.pas @@ -438,7 +438,7 @@ implementation if assigned(typesym) then result:=result+typesym.prettyname else - result:=result+'' + result:=result+''; end;