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

* added get_local_or_para_sym to search in parast and localst

Browse Source 
for self and vmt. The new function uses the owner of procdef
    instead of the parsing symtablestack used by searchsym

git-svn-id: trunk@8568 -
This commit is contained in:
peter 2007-09-19 22:37:49 +00:00
parent 73b88f4d46
commit 2652a0c416
1 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
compiler/nutils.pas
View File

@ -330,6 +330,31 @@ implementation
end; end;
function get_local_or_para_sym(const aname:string):tsym;
var
pd : tprocdef;
begin
{ we can't use searchsym here, because the
symtablestack is not fully setup when pass1
is run for nested procedures }
pd:=current_procinfo.procdef;
repeat
result := tsym(pd.localst.Find(aname));
if assigned(result) then
break;
result := tsym(pd.parast.Find(aname));
if assigned(result) then
break;
{ try the parent of a nested function }
if assigned(pd.owner.defowner) and
(pd.owner.defowner.typ=procdef) then
pd:=tprocdef(pd.owner.defowner)
else
break;
until false;
end;
function load_high_value_node(vs:tparavarsym):tnode; function load_high_value_node(vs:tparavarsym):tnode;
var var
srsym : tsym; srsym : tsym;
@ -349,13 +374,13 @@ implementation
function load_self_node:tnode; function load_self_node:tnode;
var var
srsym : tsym; srsym : tsym;
srsymtable : TSymtable;
begin begin
result:=nil; result:=nil;
searchsym('self',srsym,srsymtable);
srsym:=get_local_or_para_sym('self');
if assigned(srsym) then if assigned(srsym) then
begin begin
result:=cloadnode.create(srsym,srsymtable); result:=cloadnode.create(srsym,srsym.owner);
include(result.flags,nf_is_self); include(result.flags,nf_is_self);
end end
else else
@ -370,12 +395,11 @@ implementation
function load_result_node:tnode; function load_result_node:tnode;
var var
srsym : tsym; srsym : tsym;
srsymtable : TSymtable;
begin begin
result:=nil; result:=nil;
searchsym('result',srsym,srsymtable); srsym:=get_local_or_para_sym('result');
if assigned(srsym) then if assigned(srsym) then
result:=cloadnode.create(srsym,srsymtable) result:=cloadnode.create(srsym,srsym.owner)
else else
begin begin
result:=cerrornode.create; result:=cerrornode.create;
@ -388,13 +412,12 @@ implementation
function load_self_pointer_node:tnode; function load_self_pointer_node:tnode;
var var
srsym : tsym; srsym : tsym;
srsymtable : TSymtable;
begin begin
result:=nil; result:=nil;
searchsym('self',srsym,srsymtable); srsym:=get_local_or_para_sym('self');
if assigned(srsym) then if assigned(srsym) then
begin begin
result:=cloadnode.create(srsym,srsymtable); result:=cloadnode.create(srsym,srsym.owner);
include(result.flags,nf_load_self_pointer); include(result.flags,nf_load_self_pointer);
end end
else else
@ -409,12 +432,11 @@ implementation
function load_vmt_pointer_node:tnode; function load_vmt_pointer_node:tnode;
var var
srsym : tsym; srsym : tsym;
srsymtable : TSymtable;
begin begin
result:=nil; result:=nil;
searchsym('vmt',srsym,srsymtable); srsym:=get_local_or_para_sym('vmt');
if assigned(srsym) then if assigned(srsym) then
result:=cloadnode.create(srsym,srsymtable) result:=cloadnode.create(srsym,srsym.owner)
else else
begin begin
result:=cerrornode.create; result:=cerrornode.create;