paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-07 06:20:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

* move checking whether a field's type is valid for the field to a separate function

Browse Source 
git-svn-id: trunk@40284 -
This commit is contained in:
svenbarth 2018-11-11 22:08:24 +00:00
parent c45806c84f
commit 446f89719c
1 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
compiler/pdecvar.pas
View File

@ -28,7 +28,7 @@ interface
uses uses
cclasses, cclasses,
symtable,symsym,symdef; symtable,symsym,symdef,symtype;
type type
tvar_dec_option=(vd_record,vd_object,vd_threadvar,vd_class,vd_final,vd_canreorder,vd_check_generic); tvar_dec_option=(vd_record,vd_object,vd_threadvar,vd_class,vd_final,vd_canreorder,vd_check_generic);
@ -44,6 +44,8 @@ interface
procedure try_consume_sectiondirective(var asection: ansistring); procedure try_consume_sectiondirective(var asection: ansistring);
function check_allowed_for_var_or_const(def:tdef;allowdynarray:boolean):boolean;
implementation implementation
uses uses
@ -54,7 +56,7 @@ implementation
globtype,globals,tokens,verbose,constexp, globtype,globals,tokens,verbose,constexp,
systems, systems,
{ symtable } { symtable }
symconst,symbase,symtype,defutil,defcmp,symcreat, symconst,symbase,defutil,defcmp,symcreat,
{$if defined(i386) or defined(i8086)} {$if defined(i386) or defined(i8086)}
symcpu, symcpu,
{$endif} {$endif}
@ -1541,6 +1543,47 @@ implementation
end; end;
function check_allowed_for_var_or_const(def:tdef;allowdynarray:boolean):boolean;
var
stowner,tmpdef : tdef;
st : tsymtable;
begin
result:=true;
st:=symtablestack.top;
if not (st.symtabletype in [recordsymtable,objectsymtable]) then
exit;
stowner:=tdef(st.defowner);
while assigned(stowner) and (stowner.typ in [objectdef,recorddef]) do
begin
if def.typ=arraydef then
begin
tmpdef:=def;
while (tmpdef.typ=arraydef) do
begin
{ dynamic arrays are allowed in certain cases }
if allowdynarray and (ado_IsDynamicArray in tarraydef(tmpdef).arrayoptions) then
begin
tmpdef:=nil;
break;
end;
tmpdef:=tarraydef(tmpdef).elementdef;
end;
end
else
tmpdef:=def;
if assigned(tmpdef) and
(is_object(tmpdef) or is_record(tmpdef)) and
is_owned_by(tabstractrecorddef(stowner),tabstractrecorddef(tmpdef)) then
begin
Message1(type_e_type_is_not_completly_defined,tabstractrecorddef(tmpdef).RttiName);
result:=false;
break;
end;
stowner:=tdef(stowner.owner.defowner);
end;
end;
procedure read_record_fields(options:Tvar_dec_options; reorderlist: TFPObjectList; variantdesc : ppvariantrecdesc;out had_generic:boolean); procedure read_record_fields(options:Tvar_dec_options; reorderlist: TFPObjectList; variantdesc : ppvariantrecdesc;out had_generic:boolean);
var var
sc : TFPObjectList; sc : TFPObjectList;
@ -1644,35 +1687,9 @@ implementation
{ allow only static fields reference to struct where they are declared } { allow only static fields reference to struct where they are declared }
if not (vd_class in options) then if not (vd_class in options) then
begin begin
stowner:=tdef(recst.defowner); if not check_allowed_for_var_or_const(hdef,true) then
while assigned(stowner) and (stowner.typ in [objectdef,recorddef]) do { for error recovery or compiler will crash later }
begin hdef:=generrordef;
if hdef.typ=arraydef then
begin
tmpdef:=hdef;
while (tmpdef.typ=arraydef) do
begin
{ dynamic arrays are allowed }
if ado_IsDynamicArray in tarraydef(tmpdef).arrayoptions then
begin
tmpdef:=nil;
break;
end;
tmpdef:=tarraydef(tmpdef).elementdef;
end;
end
else
tmpdef:=hdef;
if assigned(tmpdef) and
(is_object(tmpdef) or is_record(tmpdef)) and
is_owned_by(tabstractrecorddef(stowner),tabstractrecorddef(tmpdef)) then
begin
Message1(type_e_type_is_not_completly_defined, tabstractrecorddef(tmpdef).RttiName);
{ for error recovery or compiler will crash later }
hdef:=generrordef;
end;
stowner:=tdef(stowner.owner.defowner);
end;
end; end;
{ Process procvar directives } { Process procvar directives }