|
@@ -512,8 +512,10 @@ implementation
|
|
i : longint;
|
|
i : longint;
|
|
generictype : ttypesym;
|
|
generictype : ttypesym;
|
|
current_blocktype : tblock_type;
|
|
current_blocktype : tblock_type;
|
|
|
|
+ oldaktobjectdef : tobjectdef;
|
|
begin
|
|
begin
|
|
old_object_option:=current_object_option;
|
|
old_object_option:=current_object_option;
|
|
|
|
+ oldaktobjectdef:=aktobjectdef;
|
|
|
|
|
|
{ objects and class types can't be declared local }
|
|
{ objects and class types can't be declared local }
|
|
if not(symtablestack.top.symtabletype in [globalsymtable,staticsymtable]) then
|
|
if not(symtablestack.top.symtabletype in [globalsymtable,staticsymtable]) then
|
|
@@ -826,7 +828,7 @@ implementation
|
|
result:=aktobjectdef;
|
|
result:=aktobjectdef;
|
|
|
|
|
|
{ restore old state }
|
|
{ restore old state }
|
|
- aktobjectdef:=nil;
|
|
|
|
|
|
+ aktobjectdef:=oldaktobjectdef;
|
|
testcurobject:=0;
|
|
testcurobject:=0;
|
|
typecanbeforward:=storetypecanbeforward;
|
|
typecanbeforward:=storetypecanbeforward;
|
|
current_object_option:=old_object_option;
|
|
current_object_option:=old_object_option;
|