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

factor_read_id:

Browse Source 
don't accept the generic dummy symbol if the next token isn't a "<"

sub_expr:
generate an error if we had a normal "<" comparison containing the dummy symbol on the left side instead of a specialization

git-svn-id: branches/svenbarth/generics@18003 -
This commit is contained in:
svenbarth 2011-07-16 14:13:11 +00:00
parent de1e6b1c3d
commit b23b42acb3
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
compiler/pexpr.pas
View File

@ -2030,7 +2030,13 @@ implementation
check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg); check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg);
{ if nothing found give error and return errorsym } { if nothing found give error and return errorsym }
if not assigned(srsym) then if not assigned(srsym) or
{ is this a generic dummy symbol? }
((srsym.typ=typesym) and
assigned(ttypesym(srsym).typedef) and
(ttypesym(srsym).typedef.typ=undefineddef) and
not (sp_generic_para in srsym.symoptions) and
not (token in [_LT, _LSHARPBRACKET])) then
begin begin
identifier_not_found(orgstoredpattern); identifier_not_found(orgstoredpattern);
srsym:=generrorsym; srsym:=generrorsym;
@ -2971,16 +2977,32 @@ implementation
begin begin
{ this is a normal "<" comparison } { this is a normal "<" comparison }
{ for potential generic types that are followed by a "<" { potential generic types that are followed by a "<" }
the hints are not checked }
{ a) are not checked whether they are an undefined def,
but not a generic parameter }
if (p1.nodetype=typen) and
(ttypenode(p1).typedef.typ=undefineddef) and
assigned(ttypenode(p1).typedef.typesym) and
not (sp_generic_para in ttypenode(p1).typedef.typesym.symoptions) then
begin
identifier_not_found(ttypenode(p1).typedef.typesym.RealName);
p1.Free;
p1:=cerrornode.create;
end;
{ b) don't have their hints checked }
if istypenode(p1) then if istypenode(p1) then
begin begin
gendef:=gettypedef(p1); gendef:=gettypedef(p1);
if gendef.typ in [objectdef,recorddef,arraydef,procvardef] then if gendef.typ in [objectdef,recorddef,arraydef,procvardef] then
check_hints(gendef.typesym,gendef.typesym.symoptions,gendef.typesym.deprecatedmsg); check_hints(gendef.typesym,gendef.typesym.symoptions,gendef.typesym.deprecatedmsg);
end; end;
if istypenode(p2) and
(token in [_LT, _LSHARPBRACKET]) then { Note: the second part of the expression will be needed
for nested specializations }
if istypenode(p2) {and
not (token in [_LT, _LSHARPBRACKET])} then
begin begin
gendef:=gettypedef(p2); gendef:=gettypedef(p2);
if gendef.typ in [objectdef,recorddef,arraydef,procvardef] then if gendef.typ in [objectdef,recorddef,arraydef,procvardef] then