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

* correctly handle the case should the generic dummy symbol be a procsym instead of a typesym

Browse Source 
git-svn-id: trunk@48001 -
This commit is contained in:
svenbarth 2021-01-02 23:23:34 +00:00
parent e4eed4e259
commit 7343e9c4a2
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
compiler/pexpr.pas
View File

@ -1514,9 +1514,11 @@ implementation
begin
if srsym.typ=typesym then
spezdef:=ttypesym(srsym).typedef
else if tprocsym(srsym).procdeflist.count>0 then
spezdef:=tdef(tprocsym(srsym).procdeflist[0])
else
spezdef:=tdef(tprocsym(srsym).procdeflist[0]);
if (spezdef.typ=errordef) and (sp_generic_dummy in srsym.symoptions) then
spezdef:=nil;
if (not assigned(spezdef) or (spezdef.typ=errordef)) and (sp_generic_dummy in srsym.symoptions) then
symname:=srsym.RealName
else
symname:='';
@ -3048,12 +3050,20 @@ implementation
wasgenericdummy:=false;
if assigned(srsym) and
(sp_generic_dummy in srsym.symoptions) and
(srsym.typ=typesym) and
(srsym.typ in [procsym,typesym]) and
(
(
(m_delphi in current_settings.modeswitches) and
not (token in [_LT, _LSHARPBRACKET]) and
(ttypesym(srsym).typedef.typ=undefineddef)
(
(
(srsym.typ=typesym) and
(ttypesym(srsym).typedef.typ=undefineddef)
) or (
(srsym.typ=procsym) and
(tprocsym(srsym).procdeflist.count=0)
)
)
)
or
(
@ -3306,8 +3316,14 @@ implementation
procsym :
begin
p1:=nil;
if (m_delphi in current_settings.modeswitches) and
(sp_generic_dummy in srsym.symoptions) and
(token in [_LT,_LSHARPBRACKET]) then
begin
p1:=cspecializenode.create(nil,getaddr,srsym)
end
{ check if it's a method/class method }
if is_member_read(srsym,srsymtable,p1,hdef) then
else if is_member_read(srsym,srsymtable,p1,hdef) then
begin
{ if we are accessing a owner procsym from the nested }
{ class we need to call it as a class member }
@ -4214,7 +4230,8 @@ implementation
typesym:
result:=ttypesym(sym).typedef;
procsym:
result:=tdef(tprocsym(sym).procdeflist[0]);
if not (sp_generic_dummy in sym.symoptions) or (tprocsym(sym).procdeflist.count>0) then
result:=tdef(tprocsym(sym).procdeflist[0]);
else
internalerror(2015092701);
end;

10
compiler/symtable.pas
View File

@ -3374,6 +3374,8 @@ implementation
exit;
end;
end;
if (tprocsym(sym).procdeflist.count=0) and (sp_generic_dummy in tprocsym(sym).symoptions) then
result:=is_visible_for_object(sym.owner,sym.visibility,contextobjdef);
end
else
result:=is_visible_for_object(sym.owner,sym.visibility,contextobjdef);
@ -4254,6 +4256,14 @@ implementation
result:=true;
exit;
end;
if (sp_generic_dummy in tprocsym(srsym).symoptions) and
(tprocsym(srsym).procdeflist.count=0) and
is_visible_for_object(srsym.owner,srsym.visibility,contextclassh) then
begin
srsymtable:=srsym.owner;
result:=true;
exit;
end;
end;
typesym,
fieldvarsym,