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

ptype.pas, read_named_type, expr_type:

Browse Source 
* Adjust a comment.
* Add an additional check for the owning symtable of the dummy symbol and the current_structdef just to be on the save side (it's not needed inside specializations)

git-svn-id: branches/svenbarth/generics@19721 -
This commit is contained in:
svenbarth 2011-12-02 14:11:56 +00:00
parent d94a55604e
commit 6aeceb92e8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/ptype.pas
View File

@ -846,8 +846,8 @@ implementation
dospecialize:=token=_LSHARPBRACKET
else
{ in non-Delphi modes we might get a inline specialization
without "specialize" or "<T>", so we need to handle that
special }
without "specialize" or "<T>" of the same type we're
currently parsing, so we need to handle that special }
if not dospecialize and
assigned(ttypenode(pt1).typesym) and
(ttypenode(pt1).typesym.typ=typesym) and
@ -858,6 +858,7 @@ implementation
not (m_delphi in current_settings.modeswitches) and
(ttypesym(ttypenode(pt1).typesym).typedef.typ=undefineddef) and
(df_generic in current_structdef.defoptions) and
(ttypesym(ttypenode(pt1).typesym).typedef.owner=current_structdef.owner) and
(upper(ttypenode(pt1).typesym.realname)=copy(current_structdef.objname^,1,pos('$',current_structdef.objname^)-1))
) or (
(df_specialization in current_structdef.defoptions) and