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

Added two reminders for me

Browse Source 
git-svn-id: branches/svenbarth/generics@19425 -
This commit is contained in:
svenbarth 2011-10-09 16:06:31 +00:00
parent 6b03193783
commit d54b7dd58f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/pdecobj.pas
View File

@ -308,6 +308,7 @@ implementation
begin begin
{ use single_type instead of id_type for specialize support } { use single_type instead of id_type for specialize support }
single_type(hdef,[stoAllowSpecialization,stoParseClassParent]); single_type(hdef,[stoAllowSpecialization,stoParseClassParent]);
{ TODO : handle a generic interface }
if (hdef.typ<>objectdef) then if (hdef.typ<>objectdef) then
begin begin
if intf then if intf then

7
compiler/pexpr.pas
View File

@ -2018,8 +2018,15 @@ implementation
exit; exit;
end; end;
<<<<<<< HEAD
{ check hints, but only if it isn't a potential generic symbol; { check hints, but only if it isn't a potential generic symbol;
that is checked in sub_expr if it isn't a generic } that is checked in sub_expr if it isn't a generic }
=======
{ check hints if it is the final symbol that is used (e.g. in
case of generics only the dummy symbol or the non-generic one
is found here }
{ TODO : correct this check }
>>>>>>> Added two reminders for me
if assigned(srsym) and if assigned(srsym) and
not ( not (
(srsym.typ=typesym) and (srsym.typ=typesym) and