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

* rework parse_proc_dec_finish.read_returndef a bit so that specializations as result types of generic routines are handled correctly

Browse Source 
git-svn-id: trunk@34410 -
This commit is contained in:
svenbarth 2016-09-02 15:46:08 +00:00
parent a4a1e9db12
commit 08cd62fc7e
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
compiler/pdecsub.pas
View File

@ -1253,23 +1253,37 @@ implementation
{ Add ObjectSymtable to be able to find generic type definitions }
popclass:=0;
old_current_structdef:=nil;
old_current_genericdef:=nil;
old_current_specializedef:=nil;
old_current_genericdef:=current_genericdef;
old_current_specializedef:=current_specializedef;
current_genericdef:=nil;
current_specializedef:=nil;
if assigned(pd.struct) and
(pd.parast.symtablelevel>=normal_function_level) and
not (symtablestack.top.symtabletype in [ObjectSymtable,recordsymtable]) then
begin
popclass:=push_nested_hierarchy(pd.struct);
parse_generic:=(df_generic in pd.struct.defoptions);
old_current_structdef:=current_structdef;
old_current_genericdef:=current_genericdef;
old_current_specializedef:=current_specializedef;
current_structdef:=pd.struct;
if assigned(current_structdef) and (df_generic in current_structdef.defoptions) then
current_genericdef:=current_structdef;
if assigned(current_structdef) and (df_specialization in current_structdef.defoptions) then
current_specializedef:=current_structdef;
end;
if df_generic in pd.defoptions then
begin
if pd.is_generic then
current_genericdef:=pd
else if assigned(pd.struct) then
current_genericdef:=pd.struct
else
internalerror(2016090202);
end;
if df_specialization in pd.defoptions then
begin
if pd.is_specialization then
current_specializedef:=pd
else if assigned(pd.struct) then
current_specializedef:=pd.struct
else
internalerror(2016090203);
end;
parse_generic:=(df_generic in pd.defoptions);
if pd.is_generic or pd.is_specialization then
symtablestack.push(pd.parast);
single_type(pd.returndef,[stoAllowSpecialization]);
@ -1289,12 +1303,12 @@ implementation
if popclass>0 then
begin
current_structdef:=old_current_structdef;
current_genericdef:=old_current_genericdef;
current_specializedef:=old_current_specializedef;
dec(popclass,pop_nested_hierarchy(pd.struct));
if popclass<>0 then
internalerror(201012020);
end;
current_genericdef:=old_current_genericdef;
current_specializedef:=old_current_specializedef;
parse_generic:=old_parse_generic;
end;