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

- the error recovery handling is no longer required

Browse Source 
git-svn-id: trunk@43588 -
This commit is contained in:
svenbarth 2019-11-25 20:28:29 +00:00
parent 5b71ba2a9b
commit 97eefb6ac3
1 changed files with 0 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
compiler/pgenutil.pas
View File

@ -454,7 +454,6 @@ uses
function generate_specialization_phase1(out context:tspecializationcontext;genericdef:tdef;parsedtype:tdef;symname:string;parsedpos:tfileposinfo):tdef;
var
pt2 : tnode;
errorrecovery,
found,
first,
err : boolean;
@ -469,7 +468,6 @@ uses
result:=nil;
{ either symname must be given or genericdef needs to be valid }
errorrecovery:=false;
if (symname='') and
(not assigned(genericdef) or
(
@ -491,88 +489,6 @@ uses
internalerror(2019112401);
end;
{ Only parse the parameters for recovery or
for recording in genericbuf }
if errorrecovery then
begin
first:=assigned(parsedtype);
if not first and not try_to_consume(_LT) then
consume(_LSHARPBRACKET);
gencount:=0;
{ handle "<>" }
if not first and ((token=_RSHARPBRACKET) or (token=_GT)) then
Message(type_e_type_id_expected)
else
repeat
if not first then
begin
pt2:=factor(false,[ef_type_only]);
pt2.free;
end;
first:=false;
inc(gencount);
until not try_to_consume(_COMMA);
if not try_to_consume(_GT) then
consume(_RSHARPBRACKET);
{ we need to return a def that can later pass some checks like
whether it's an interface or not }
if not errorrecovery and
(not assigned(result) or (result.typ=undefineddef)) then
begin
if (symname='') and tstoreddef(genericdef).is_generic then
{ this happens in non-Delphi modes }
result:=genericdef
else
begin
{ find the corresponding generic symbol so that any checks
done on the returned def will be handled correctly }
str(gencount,countstr);
if symname='' then
genname:=ttypesym(genericdef.typesym).realname
else
genname:=symname;
genname:=genname+'$'+countstr;
ugenname:=upper(genname);
{ first check whether the found name is the same as that of
the current def or one of its (generic) surrounding defs;
this is necessary as the symbol of the generic can not yet
be used for lookup as it still contains a reference to an
errordef) }
def:=current_genericdef;
repeat
if def.typ in [objectdef,recorddef] then
if tabstractrecorddef(def).objname^=ugenname then
begin
result:=def;
break;
end;
def:=tstoreddef(def.owner.defowner);
until not assigned(def) or not (df_generic in def.defoptions);
{ it's not part of the current object hierarchy, so search
for the symbol }
if not assigned(result) then
begin
srsym:=nil;
if not searchsym(ugenname,srsym,st) or
(srsym.typ<>typesym) then
begin
identifier_not_found(genname);
result:=generrordef;
exit;
end;
result:=ttypesym(srsym).typedef;
{ this happens in non-Delphi modes if we encounter a
specialization of the generic class or record we're
currently parsing }
if (result.typ=errordef) and assigned(current_structdef) and
(current_structdef.objname^=ugenname) then
result:=current_structdef;
end;
end;
end;
exit;
end;
if not assigned(parsedtype) and not try_to_consume(_LT) then
begin
consume(_LSHARPBRACKET);