paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-07 08:47:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

* renamed objcdef.addencodedtype to objcaddencodedtype for consistency

Browse Source 
reasons, and to prevent name clashes

git-svn-id: trunk@16598 -
This commit is contained in:
Jonas Maebe 2010-12-19 19:37:47 +00:00
parent 9b79fb3ac9
commit cec5843f95
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/objcdef.pas
View File

@ -48,7 +48,7 @@ interface
type type
trecordinfostate = (ris_initial, ris_afterpointer, ris_dontprint); trecordinfostate = (ris_initial, ris_afterpointer, ris_dontprint);
function addencodedtype(def: tdef; recordinfostate: trecordinfostate; bpacked: boolean; var encodedstr: ansistring; out founderror: tdef): boolean; function objcaddencodedtype(def: tdef; recordinfostate: trecordinfostate; bpacked: boolean; var encodedstr: ansistring; out founderror: tdef): boolean;
implementation implementation
@ -137,7 +137,7 @@ implementation
encodedstr:=encodedstr+'}{?='; encodedstr:=encodedstr+'}{?=';
end end
end; end;
if not addencodedtype(field.vardef,ris_afterpointer,bpacked,encodedstr,founderror) then if not objcaddencodedtype(field.vardef,ris_afterpointer,bpacked,encodedstr,founderror) then
exit; exit;
end; end;
for i:=0 to variantstarts.count-1 do for i:=0 to variantstarts.count-1 do
@ -148,7 +148,7 @@ implementation
end; end;
function addencodedtype(def: tdef; recordinfostate: trecordinfostate; bpacked: boolean; var encodedstr: ansistring; out founderror: tdef): boolean; function objcaddencodedtype(def: tdef; recordinfostate: trecordinfostate; bpacked: boolean; var encodedstr: ansistring; out founderror: tdef): boolean;
var var
recname: ansistring; recname: ansistring;
recdef: trecorddef; recdef: trecorddef;
@ -226,7 +226,7 @@ implementation
newstate:=recordinfostate; newstate:=recordinfostate;
if (recordinfostate<ris_dontprint) then if (recordinfostate<ris_dontprint) then
newstate:=succ(newstate); newstate:=succ(newstate);
if not addencodedtype(tpointerdef(def).pointeddef,newstate,false,encodedstr,founderror) then if not objcaddencodedtype(tpointerdef(def).pointeddef,newstate,false,encodedstr,founderror) then
begin begin
result:=false; result:=false;
{ report the exact (nested) error defintion } { report the exact (nested) error defintion }
@ -360,7 +360,7 @@ implementation
encodedstr:=encodedstr+'['+tostr(len); encodedstr:=encodedstr+'['+tostr(len);
{ Embedded structured types in the array are printed { Embedded structured types in the array are printed
in full regardless of the current recordinfostate. } in full regardless of the current recordinfostate. }
if not addencodedtype(tarraydef(def).elementdef,ris_initial,false,encodedstr,founderror) then if not objcaddencodedtype(tarraydef(def).elementdef,ris_initial,false,encodedstr,founderror) then
begin begin
result:=false; result:=false;
{ report the exact (nested) error defintion } { report the exact (nested) error defintion }
@ -435,7 +435,7 @@ implementation
function objctryencodetype(def: tdef; out encodedtype: ansistring; out founderror: tdef): boolean; function objctryencodetype(def: tdef; out encodedtype: ansistring; out founderror: tdef): boolean;
begin begin
result:=addencodedtype(def,ris_initial,false,encodedtype,founderror); result:=objcaddencodedtype(def,ris_initial,false,encodedtype,founderror);
end; end;

6
compiler/objcutil.pas
View File

@ -222,13 +222,13 @@ end;
vs:=tparavarsym(pd.paras[i]); vs:=tparavarsym(pd.paras[i]);
if (vo_is_funcret in vs.varoptions) then if (vo_is_funcret in vs.varoptions) then
continue; continue;
{ addencodedtype always assumes a value parameter, so add { objcaddencodedtype always assumes a value parameter, so add
a pointer indirection for var/out parameters. } a pointer indirection for var/out parameters. }
if not paramanager.push_addr_param(vs_value,vs.vardef,pocall_cdecl) and if not paramanager.push_addr_param(vs_value,vs.vardef,pocall_cdecl) and
(vs.varspez in [vs_var,vs_out,vs_constref]) then (vs.varspez in [vs_var,vs_out,vs_constref]) then
result:=result+'^'; result:=result+'^';
{ Add the parameter type. } { Add the parameter type. }
if not addencodedtype(vs.vardef,ris_initial,false,result,founderror) then if not objcaddencodedtype(vs.vardef,ris_initial,false,result,founderror) then
{ should be checked earlier on } { should be checked earlier on }
internalerror(2009081701); internalerror(2009081701);
{ And the total size of the parameters coming before this one { And the total size of the parameters coming before this one
@ -242,7 +242,7 @@ end;
result:=tostr(totalsize)+result; result:=tostr(totalsize)+result;
{ And the type of the function result (void in case of a procedure). } { And the type of the function result (void in case of a procedure). }
temp:=''; temp:='';
if not addencodedtype(pd.returndef,ris_initial,false,temp,founderror) then if not objcaddencodedtype(pd.returndef,ris_initial,false,temp,founderror) then
internalerror(2009081801); internalerror(2009081801);
result:=temp+result; result:=temp+result;
end; end;