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

* also don't call procvar when converting to procvar

Browse Source
This commit is contained in:
peter 2004-12-27 16:54:29 +00:00
parent c1bf99c30a
commit f0267daa4a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/ncnv.pas
View File

@ -1219,7 +1219,7 @@ implementation
var var
htype : ttype; htype : ttype;
hp : tnode; hp : tnode;
currprocdef, currprocdef : tabstractprocdef;
aprocdef : tprocdef; aprocdef : tprocdef;
eq : tequaltype; eq : tequaltype;
cdoptions : tcompare_defs_options; cdoptions : tcompare_defs_options;
@ -1241,11 +1241,11 @@ implementation
exit; exit;
end; end;
{ tp procvar support. Skip typecasts to record or set. Those { tp procvar support. Skip typecasts to procvar, record or set. Those
convert on the procvar value. This is used to access the convert on the procvar value. This is used to access the
fields of a methodpointer } fields of a methodpointer }
if not(nf_load_procvar in flags) and if not(nf_load_procvar in flags) and
not(resulttype.def.deftype in [recorddef,setdef]) then not(resulttype.def.deftype in [procvardef,recorddef,setdef]) then
maybe_call_procvar(left,true); maybe_call_procvar(left,true);
{ convert array constructors to sets, because there is no conversion { convert array constructors to sets, because there is no conversion
@ -1343,14 +1343,14 @@ implementation
is checked below } is checked below }
convtype:=tc_equal; convtype:=tc_equal;
hp:=tcallnode(left).right.getcopy; hp:=tcallnode(left).right.getcopy;
currprocdef:=tprocdef(hp.resulttype.def); currprocdef:=tabstractprocdef(hp.resulttype.def);
end end
else else
begin begin
convtype:=tc_proc_2_procvar; convtype:=tc_proc_2_procvar;
currprocdef:=Tprocsym(Tcallnode(left).symtableprocentry).search_procdef_byprocvardef(Tprocvardef(resulttype.def)); currprocdef:=Tprocsym(Tcallnode(left).symtableprocentry).search_procdef_byprocvardef(Tprocvardef(resulttype.def));
hp:=cloadnode.create_procvar(tprocsym(tcallnode(left).symtableprocentry), hp:=cloadnode.create_procvar(tprocsym(tcallnode(left).symtableprocentry),
currprocdef,tcallnode(left).symtableproc); tprocdef(currprocdef),tcallnode(left).symtableproc);
if (tcallnode(left).symtableprocentry.owner.symtabletype=objectsymtable) then if (tcallnode(left).symtableprocentry.owner.symtabletype=objectsymtable) then
begin begin
if assigned(tcallnode(left).methodpointer) then if assigned(tcallnode(left).methodpointer) then
@ -2497,7 +2497,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.168 2004-12-26 16:22:01 peter Revision 1.169 2004-12-27 16:54:29 peter
* also don't call procvar when converting to procvar
Revision 1.168 2004/12/26 16:22:01 peter
* fix lineinfo for with blocks * fix lineinfo for with blocks
Revision 1.167 2004/12/07 16:11:52 peter Revision 1.167 2004/12/07 16:11:52 peter