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

* rename aktobjectdef to current_objectdef

Browse Source 
git-svn-id: trunk@12027 -
This commit is contained in:
peter 2008-11-06 19:46:31 +00:00
parent 67f56b7adf
commit 84112032c3
4 changed files with 104 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
compiler/pdecobj.pas
View File

@ -68,7 +68,7 @@ implementation
begin begin
consume(_CONSTRUCTOR); consume(_CONSTRUCTOR);
{ must be at same level as in implementation } { must be at same level as in implementation }
parse_proc_head(aktobjectdef,potype_constructor,pd); parse_proc_head(current_objectdef,potype_constructor,pd);
if not assigned(pd) then if not assigned(pd) then
begin begin
consume(_SEMICOLON); consume(_SEMICOLON);
@ -78,7 +78,7 @@ implementation
(pd.procsym.name<>'INIT') then (pd.procsym.name<>'INIT') then
Message(parser_e_constructorname_must_be_init); Message(parser_e_constructorname_must_be_init);
consume(_SEMICOLON); consume(_SEMICOLON);
include(aktobjectdef.objectoptions,oo_has_constructor); include(current_objectdef.objectoptions,oo_has_constructor);
{ Set return type, class constructors return the { Set return type, class constructors return the
created instance, object constructors return boolean } created instance, object constructors return boolean }
if is_class(pd._class) then if is_class(pd._class) then
@ -98,17 +98,17 @@ implementation
p : tpropertysym; p : tpropertysym;
begin begin
{ check for a class } { check for a class }
if not((is_class_or_interface_or_dispinterface(aktobjectdef)) or if not((is_class_or_interface_or_dispinterface(current_objectdef)) or
(not(m_tp7 in current_settings.modeswitches) and (is_object(aktobjectdef)))) then (not(m_tp7 in current_settings.modeswitches) and (is_object(current_objectdef)))) then
Message(parser_e_syntax_error); Message(parser_e_syntax_error);
consume(_PROPERTY); consume(_PROPERTY);
p:=read_property_dec(aktobjectdef); p:=read_property_dec(current_objectdef);
consume(_SEMICOLON); consume(_SEMICOLON);
if try_to_consume(_DEFAULT) then if try_to_consume(_DEFAULT) then
begin begin
if oo_has_default_property in aktobjectdef.objectoptions then if oo_has_default_property in current_objectdef.objectoptions then
message(parser_e_only_one_default_property); message(parser_e_only_one_default_property);
include(aktobjectdef.objectoptions,oo_has_default_property); include(current_objectdef.objectoptions,oo_has_default_property);
include(p.propoptions,ppo_defaultproperty); include(p.propoptions,ppo_defaultproperty);
if not(ppo_hasparameters in p.propoptions) then if not(ppo_hasparameters in p.propoptions) then
message(parser_e_property_need_paras); message(parser_e_property_need_paras);
@ -126,7 +126,7 @@ implementation
pd : tprocdef; pd : tprocdef;
begin begin
consume(_DESTRUCTOR); consume(_DESTRUCTOR);
parse_proc_head(aktobjectdef,potype_destructor,pd); parse_proc_head(current_objectdef,potype_destructor,pd);
if not assigned(pd) then if not assigned(pd) then
begin begin
consume(_SEMICOLON); consume(_SEMICOLON);
@ -139,7 +139,7 @@ implementation
(m_fpc in current_settings.modeswitches) then (m_fpc in current_settings.modeswitches) then
Message(parser_e_no_paras_for_destructor); Message(parser_e_no_paras_for_destructor);
consume(_SEMICOLON); consume(_SEMICOLON);
include(aktobjectdef.objectoptions,oo_has_destructor); include(current_objectdef.objectoptions,oo_has_destructor);
{ no return value } { no return value }
pd.returndef:=voidtype; pd.returndef:=voidtype;
destructor_head:=pd; destructor_head:=pd;
@ -151,16 +151,16 @@ implementation
{ publishable } { publishable }
if classtype in [odt_interfacecom,odt_class] then if classtype in [odt_interfacecom,odt_class] then
begin begin
aktobjectdef.objecttype:=classtype; current_objectdef.objecttype:=classtype;
{ set published flag in $M+ mode or it is inherited } { set published flag in $M+ mode or it is inherited }
if (cs_generate_rtti in current_settings.localswitches) or if (cs_generate_rtti in current_settings.localswitches) or
(assigned(aktobjectdef.childof) and (assigned(current_objectdef.childof) and
(oo_can_have_published in aktobjectdef.childof.objectoptions)) then (oo_can_have_published in current_objectdef.childof.objectoptions)) then
include(aktobjectdef.objectoptions,oo_can_have_published); include(current_objectdef.objectoptions,oo_can_have_published);
{ in "publishable" classes the default access type is published, this is { in "publishable" classes the default access type is published, this is
done separate from above if-statement because the option can be done separate from above if-statement because the option can be
inherited from the forward class definition } inherited from the forward class definition }
if (oo_can_have_published in aktobjectdef.objectoptions) then if (oo_can_have_published in current_objectdef.objectoptions) then
current_object_option:=[sp_published]; current_object_option:=[sp_published];
end; end;
end; end;
@ -172,10 +172,10 @@ implementation
i : longint; i : longint;
def : tdef; def : tdef;
begin begin
include(aktobjectdef.objectoptions,oo_has_virtual); include(current_objectdef.objectoptions,oo_has_virtual);
for i:=0 to aktobjectdef.symtable.DefList.count-1 do for i:=0 to current_objectdef.symtable.DefList.count-1 do
begin begin
def:=tdef(aktobjectdef.symtable.DefList[i]); def:=tdef(current_objectdef.symtable.DefList[i]);
if assigned(def) and if assigned(def) and
(def.typ=procdef) then (def.typ=procdef) then
begin begin
@ -215,9 +215,9 @@ implementation
{ also anonym objects aren't allow (o : object a : longint; end;) } { also anonym objects aren't allow (o : object a : longint; end;) }
if n='' then if n='' then
Message(parser_f_no_anonym_objects); Message(parser_f_no_anonym_objects);
aktobjectdef:=tobjectdef.create(classtype,n,nil); current_objectdef:=tobjectdef.create(classtype,n,nil);
include(aktobjectdef.objectoptions,oo_is_forward); include(current_objectdef.objectoptions,oo_is_forward);
object_dec:=aktobjectdef; object_dec:=current_objectdef;
typecanbeforward:=storetypecanbeforward; typecanbeforward:=storetypecanbeforward;
readobjecttype:=false; readobjecttype:=false;
exit; exit;
@ -240,15 +240,15 @@ implementation
{ also anonym objects aren't allow (o : object a : longint; end;) } { also anonym objects aren't allow (o : object a : longint; end;) }
if n='' then if n='' then
Message(parser_f_no_anonym_objects); Message(parser_f_no_anonym_objects);
aktobjectdef:=tobjectdef.create(classtype,n,nil); current_objectdef:=tobjectdef.create(classtype,n,nil);
if (cs_compilesystem in current_settings.moduleswitches) and if (cs_compilesystem in current_settings.moduleswitches) and
(classtype=odt_interfacecom) and (upper(n)='IUNKNOWN') then (classtype=odt_interfacecom) and (upper(n)='IUNKNOWN') then
interface_iunknown:=aktobjectdef; interface_iunknown:=current_objectdef;
include(aktobjectdef.objectoptions,oo_is_forward); include(current_objectdef.objectoptions,oo_is_forward);
if (cs_generate_rtti in current_settings.localswitches) and if (cs_generate_rtti in current_settings.localswitches) and
(classtype=odt_interfacecom) then (classtype=odt_interfacecom) then
include(aktobjectdef.objectoptions,oo_can_have_published); include(current_objectdef.objectoptions,oo_can_have_published);
object_dec:=aktobjectdef; object_dec:=current_objectdef;
typecanbeforward:=storetypecanbeforward; typecanbeforward:=storetypecanbeforward;
readobjecttype:=false; readobjecttype:=false;
exit; exit;
@ -294,17 +294,17 @@ implementation
{ also anonym objects aren't allow (o : object a : longint; end;) } { also anonym objects aren't allow (o : object a : longint; end;) }
if n='' then if n='' then
Message(parser_f_no_anonym_objects); Message(parser_f_no_anonym_objects);
aktobjectdef:=tobjectdef.create(odt_class,n,nil); current_objectdef:=tobjectdef.create(odt_class,n,nil);
if (cs_compilesystem in current_settings.moduleswitches) and (upper(n)='TOBJECT') then if (cs_compilesystem in current_settings.moduleswitches) and (upper(n)='TOBJECT') then
class_tobject:=aktobjectdef; class_tobject:=current_objectdef;
aktobjectdef.objecttype:=odt_class; current_objectdef.objecttype:=odt_class;
include(aktobjectdef.objectoptions,oo_is_forward); include(current_objectdef.objectoptions,oo_is_forward);
if (cs_generate_rtti in current_settings.localswitches) then if (cs_generate_rtti in current_settings.localswitches) then
include(aktobjectdef.objectoptions,oo_can_have_published); include(current_objectdef.objectoptions,oo_can_have_published);
{ all classes must have a vmt !! at offset zero } { all classes must have a vmt !! at offset zero }
if not(oo_has_vmt in aktobjectdef.objectoptions) then if not(oo_has_vmt in current_objectdef.objectoptions) then
aktobjectdef.insertvmt; current_objectdef.insertvmt;
object_dec:=aktobjectdef; object_dec:=current_objectdef;
typecanbeforward:=storetypecanbeforward; typecanbeforward:=storetypecanbeforward;
readobjecttype:=false; readobjecttype:=false;
exit; exit;
@ -326,15 +326,15 @@ implementation
Message1(type_e_interface_type_expected,intfdef.typename); Message1(type_e_interface_type_expected,intfdef.typename);
exit; exit;
end; end;
if aktobjectdef.find_implemented_interface(intfdef)<>nil then if current_objectdef.find_implemented_interface(intfdef)<>nil then
Message1(sym_e_duplicate_id,intfdef.objname^) Message1(sym_e_duplicate_id,intfdef.objname^)
else else
begin begin
{ allocate and prepare the GUID only if the class { allocate and prepare the GUID only if the class
implements some interfaces. } implements some interfaces. }
if aktobjectdef.ImplementedInterfaces.count = 0 then if current_objectdef.ImplementedInterfaces.count = 0 then
aktobjectdef.prepareguid; current_objectdef.prepareguid;
aktobjectdef.ImplementedInterfaces.Add(TImplementedInterface.Create(intfdef)); current_objectdef.ImplementedInterfaces.Add(TImplementedInterface.Create(intfdef));
end; end;
end; end;
@ -362,13 +362,13 @@ implementation
p:=comp_expr(true); p:=comp_expr(true);
if p.nodetype=stringconstn then if p.nodetype=stringconstn then
begin begin
stringdispose(aktobjectdef.iidstr); stringdispose(current_objectdef.iidstr);
aktobjectdef.iidstr:=stringdup(strpas(tstringconstnode(p).value_str)); { or upper? } current_objectdef.iidstr:=stringdup(strpas(tstringconstnode(p).value_str)); { or upper? }
p.free; p.free;
valid:=string2guid(aktobjectdef.iidstr^,aktobjectdef.iidguid^); valid:=string2guid(current_objectdef.iidstr^,current_objectdef.iidguid^);
if (classtype in [odt_interfacecom,odt_dispinterface]) and not assigned(aktobjectdef.iidguid) and not valid then if (classtype in [odt_interfacecom,odt_dispinterface]) and not assigned(current_objectdef.iidguid) and not valid then
Message(parser_e_improper_guid_syntax); Message(parser_e_improper_guid_syntax);
include(aktobjectdef.objectoptions,oo_has_valid_guid); include(current_objectdef.objectoptions,oo_has_valid_guid);
end end
else else
begin begin
@ -426,7 +426,7 @@ implementation
if not(is_interface(childof)) then if not(is_interface(childof)) then
Message(parser_e_mix_of_classes_and_objects); Message(parser_e_mix_of_classes_and_objects);
classtype:=childof.objecttype; classtype:=childof.objecttype;
aktobjectdef.objecttype:=classtype; current_objectdef.objecttype:=classtype;
end; end;
odt_cppclass: odt_cppclass:
if not(is_cppclass(childof)) then if not(is_cppclass(childof)) then
@ -454,10 +454,10 @@ implementation
begin begin
case classtype of case classtype of
odt_class: odt_class:
if aktobjectdef<>class_tobject then if current_objectdef<>class_tobject then
childof:=class_tobject; childof:=class_tobject;
odt_interfacecom: odt_interfacecom:
if aktobjectdef<>interface_iunknown then if current_objectdef<>interface_iunknown then
childof:=interface_iunknown; childof:=interface_iunknown;
end; end;
end; end;
@ -469,17 +469,17 @@ implementation
at the start of the new definition and will reset it below after the at the start of the new definition and will reset it below after the
parent has been set } parent has been set }
if not(oo_is_forward in childof.objectoptions) then if not(oo_is_forward in childof.objectoptions) then
aktobjectdef.set_parent(childof) current_objectdef.set_parent(childof)
else else
Message1(parser_e_forward_declaration_must_be_resolved,childof.objrealname^); Message1(parser_e_forward_declaration_must_be_resolved,childof.objrealname^);
end; end;
{ remove forward flag, is resolved } { remove forward flag, is resolved }
exclude(aktobjectdef.objectoptions,oo_is_forward); exclude(current_objectdef.objectoptions,oo_is_forward);
if hasparentdefined then if hasparentdefined then
begin begin
if aktobjectdef.objecttype=odt_class then if current_objectdef.objecttype=odt_class then
begin begin
if assigned(intfchildof) then if assigned(intfchildof) then
handleImplementedInterface(intfchildof); handleImplementedInterface(intfchildof);
@ -514,11 +514,11 @@ implementation
i : longint; i : longint;
generictype : ttypesym; generictype : ttypesym;
current_blocktype : tblock_type; current_blocktype : tblock_type;
oldaktobjectdef : tobjectdef; oldcurrent_objectdef : tobjectdef;
old_parse_generic : boolean; old_parse_generic : boolean;
begin begin
old_object_option:=current_object_option; old_object_option:=current_object_option;
oldaktobjectdef:=aktobjectdef; oldcurrent_objectdef:=current_objectdef;
old_parse_generic:=parse_generic; old_parse_generic:=parse_generic;
{ objects and class types can't be declared local } { objects and class types can't be declared local }
@ -540,21 +540,21 @@ implementation
begin begin
Message(parser_e_forward_mismatch); Message(parser_e_forward_mismatch);
{ recover } { recover }
aktobjectdef:=tobjectdef.create(classtype,n,nil); current_objectdef:=tobjectdef.create(classtype,n,nil);
include(aktobjectdef.objectoptions,oo_is_forward); include(current_objectdef.objectoptions,oo_is_forward);
end end
else else
aktobjectdef:=fd current_objectdef:=fd
end end
else else
begin begin
{ anonym objects aren't allow (o : object a : longint; end;) } { anonym objects aren't allow (o : object a : longint; end;) }
if n='' then if n='' then
Message(parser_f_no_anonym_objects); Message(parser_f_no_anonym_objects);
aktobjectdef:=tobjectdef.create(classtype,n,nil); current_objectdef:=tobjectdef.create(classtype,n,nil);
{ include forward flag, it'll be removed after the parent class have been { include forward flag, it'll be removed after the parent class have been
added. This is to prevent circular childof loops } added. This is to prevent circular childof loops }
include(aktobjectdef.objectoptions,oo_is_forward); include(current_objectdef.objectoptions,oo_is_forward);
end; end;
{ read list of parent classes } { read list of parent classes }
@ -567,11 +567,11 @@ implementation
{ set class flags and inherits published } { set class flags and inherits published }
setclassattributes; setclassattributes;
symtablestack.push(aktobjectdef.symtable); symtablestack.push(current_objectdef.symtable);
testcurobject:=1; testcurobject:=1;
{ add generic type parameters } { add generic type parameters }
aktobjectdef.genericdef:=genericdef; current_objectdef.genericdef:=genericdef;
if assigned(genericlist) then if assigned(genericlist) then
begin begin
for i:=0 to genericlist.count-1 do for i:=0 to genericlist.count-1 do
@ -579,11 +579,11 @@ implementation
generictype:=ttypesym(genericlist[i]); generictype:=ttypesym(genericlist[i]);
if generictype.typedef.typ=undefineddef then if generictype.typedef.typ=undefineddef then
begin begin
include(aktobjectdef.defoptions,df_generic); include(current_objectdef.defoptions,df_generic);
parse_generic:=true; parse_generic:=true;
end end
else else
include(aktobjectdef.defoptions,df_specialization); include(current_objectdef.defoptions,df_specialization);
symtablestack.top.insert(generictype); symtablestack.top.insert(generictype);
end; end;
end; end;
@ -597,14 +597,14 @@ implementation
case token of case token of
_TYPE : _TYPE :
begin begin
if ([df_generic,df_specialization]*aktobjectdef.defoptions)=[] then if ([df_generic,df_specialization]*current_objectdef.defoptions)=[] then
Message(parser_e_type_and_var_only_in_generics); Message(parser_e_type_and_var_only_in_generics);
consume(_TYPE); consume(_TYPE);
current_blocktype:=bt_type; current_blocktype:=bt_type;
end; end;
_VAR : _VAR :
begin begin
if ([df_generic,df_specialization]*aktobjectdef.defoptions)=[] then if ([df_generic,df_specialization]*current_objectdef.defoptions)=[] then
Message(parser_e_type_and_var_only_in_generics); Message(parser_e_type_and_var_only_in_generics);
consume(_VAR); consume(_VAR);
current_blocktype:=bt_general; current_blocktype:=bt_general;
@ -614,23 +614,23 @@ implementation
case idtoken of case idtoken of
_PRIVATE : _PRIVATE :
begin begin
if is_interface(aktobjectdef) then if is_interface(current_objectdef) then
Message(parser_e_no_access_specifier_in_interfaces); Message(parser_e_no_access_specifier_in_interfaces);
consume(_PRIVATE); consume(_PRIVATE);
current_object_option:=[sp_private]; current_object_option:=[sp_private];
include(aktobjectdef.objectoptions,oo_has_private); include(current_objectdef.objectoptions,oo_has_private);
end; end;
_PROTECTED : _PROTECTED :
begin begin
if is_interface(aktobjectdef) then if is_interface(current_objectdef) then
Message(parser_e_no_access_specifier_in_interfaces); Message(parser_e_no_access_specifier_in_interfaces);
consume(_PROTECTED); consume(_PROTECTED);
current_object_option:=[sp_protected]; current_object_option:=[sp_protected];
include(aktobjectdef.objectoptions,oo_has_protected); include(current_objectdef.objectoptions,oo_has_protected);
end; end;
_PUBLIC : _PUBLIC :
begin begin
if is_interface(aktobjectdef) then if is_interface(current_objectdef) then
Message(parser_e_no_access_specifier_in_interfaces); Message(parser_e_no_access_specifier_in_interfaces);
consume(_PUBLIC); consume(_PUBLIC);
current_object_option:=[sp_public]; current_object_option:=[sp_public];
@ -640,14 +640,14 @@ implementation
{ we've to check for a pushlished section in non- } { we've to check for a pushlished section in non- }
{ publishable classes later, if a real declaration } { publishable classes later, if a real declaration }
{ this is the way, delphi does it } { this is the way, delphi does it }
if is_interface(aktobjectdef) then if is_interface(current_objectdef) then
Message(parser_e_no_access_specifier_in_interfaces); Message(parser_e_no_access_specifier_in_interfaces);
consume(_PUBLISHED); consume(_PUBLISHED);
current_object_option:=[sp_published]; current_object_option:=[sp_published];
end; end;
_STRICT : _STRICT :
begin begin
if is_interface(aktobjectdef) then if is_interface(current_objectdef) then
Message(parser_e_no_access_specifier_in_interfaces); Message(parser_e_no_access_specifier_in_interfaces);
consume(_STRICT); consume(_STRICT);
if token=_ID then if token=_ID then
@ -657,13 +657,13 @@ implementation
begin begin
consume(_PRIVATE); consume(_PRIVATE);
current_object_option:=[sp_strictprivate]; current_object_option:=[sp_strictprivate];
include(aktobjectdef.objectoptions,oo_has_strictprivate); include(current_objectdef.objectoptions,oo_has_strictprivate);
end; end;
_PROTECTED: _PROTECTED:
begin begin
consume(_PROTECTED); consume(_PROTECTED);
current_object_option:=[sp_strictprotected]; current_object_option:=[sp_strictprotected];
include(aktobjectdef.objectoptions,oo_has_strictprotected); include(current_objectdef.objectoptions,oo_has_strictprotected);
end; end;
else else
message(parser_e_protected_or_private_expected); message(parser_e_protected_or_private_expected);
@ -676,11 +676,11 @@ implementation
begin begin
if current_blocktype=bt_general then if current_blocktype=bt_general then
begin begin
if is_interface(aktobjectdef) then if is_interface(current_objectdef) then
Message(parser_e_no_vars_in_interfaces); Message(parser_e_no_vars_in_interfaces);
if (sp_published in current_object_option) and if (sp_published in current_object_option) and
not(oo_can_have_published in aktobjectdef.objectoptions) then not(oo_can_have_published in current_objectdef.objectoptions) then
Message(parser_e_cant_have_published); Message(parser_e_cant_have_published);
read_record_fields([vd_object]) read_record_fields([vd_object])
@ -699,12 +699,12 @@ implementation
_CLASS : _CLASS :
begin begin
if (sp_published in current_object_option) and if (sp_published in current_object_option) and
not(oo_can_have_published in aktobjectdef.objectoptions) then not(oo_can_have_published in current_objectdef.objectoptions) then
Message(parser_e_cant_have_published); Message(parser_e_cant_have_published);
oldparse_only:=parse_only; oldparse_only:=parse_only;
parse_only:=true; parse_only:=true;
pd:=parse_proc_dec(aktobjectdef); pd:=parse_proc_dec(current_objectdef);
{ this is for error recovery as well as forward } { this is for error recovery as well as forward }
{ interface mappings, i.e. mapping to a method } { interface mappings, i.e. mapping to a method }
@ -726,11 +726,11 @@ implementation
{ add procdef options to objectdef options } { add procdef options to objectdef options }
if (po_msgint in pd.procoptions) then if (po_msgint in pd.procoptions) then
include(aktobjectdef.objectoptions,oo_has_msgint); include(current_objectdef.objectoptions,oo_has_msgint);
if (po_msgstr in pd.procoptions) then if (po_msgstr in pd.procoptions) then
include(aktobjectdef.objectoptions,oo_has_msgstr); include(current_objectdef.objectoptions,oo_has_msgstr);
if (po_virtualmethod in pd.procoptions) then if (po_virtualmethod in pd.procoptions) then
include(aktobjectdef.objectoptions,oo_has_virtual); include(current_objectdef.objectoptions,oo_has_virtual);
chkcpp(pd); chkcpp(pd);
end; end;
@ -747,14 +747,14 @@ implementation
_CONSTRUCTOR : _CONSTRUCTOR :
begin begin
if (sp_published in current_object_option) and if (sp_published in current_object_option) and
not(oo_can_have_published in aktobjectdef.objectoptions) then not(oo_can_have_published in current_objectdef.objectoptions) then
Message(parser_e_cant_have_published); Message(parser_e_cant_have_published);
if not(sp_public in current_object_option) and if not(sp_public in current_object_option) and
not(sp_published in current_object_option) then not(sp_published in current_object_option) then
Message(parser_w_constructor_should_be_public); Message(parser_w_constructor_should_be_public);
if is_interface(aktobjectdef) then if is_interface(current_objectdef) then
Message(parser_e_no_con_des_in_interfaces); Message(parser_e_no_con_des_in_interfaces);
oldparse_only:=parse_only; oldparse_only:=parse_only;
@ -768,7 +768,7 @@ implementation
{ add procdef options to objectdef options } { add procdef options to objectdef options }
if (po_virtualmethod in pd.procoptions) then if (po_virtualmethod in pd.procoptions) then
include(aktobjectdef.objectoptions,oo_has_virtual); include(current_objectdef.objectoptions,oo_has_virtual);
chkcpp(pd); chkcpp(pd);
{ Support hint directives } { Support hint directives }
@ -783,13 +783,13 @@ implementation
_DESTRUCTOR : _DESTRUCTOR :
begin begin
if (sp_published in current_object_option) and if (sp_published in current_object_option) and
not(oo_can_have_published in aktobjectdef.objectoptions) then not(oo_can_have_published in current_objectdef.objectoptions) then
Message(parser_e_cant_have_published); Message(parser_e_cant_have_published);
if there_is_a_destructor then if there_is_a_destructor then
Message(parser_n_only_one_destructor); Message(parser_n_only_one_destructor);
if is_interface(aktobjectdef) then if is_interface(current_objectdef) then
Message(parser_e_no_con_des_in_interfaces); Message(parser_e_no_con_des_in_interfaces);
if not(sp_public in current_object_option) then if not(sp_public in current_object_option) then
@ -807,7 +807,7 @@ implementation
{ add procdef options to objectdef options } { add procdef options to objectdef options }
if (po_virtualmethod in pd.procoptions) then if (po_virtualmethod in pd.procoptions) then
include(aktobjectdef.objectoptions,oo_has_virtual); include(current_objectdef.objectoptions,oo_has_virtual);
chkcpp(pd); chkcpp(pd);
@ -832,23 +832,23 @@ implementation
end; end;
{ generate vmt space if needed } { generate vmt space if needed }
if not(oo_has_vmt in aktobjectdef.objectoptions) and if not(oo_has_vmt in current_objectdef.objectoptions) and
(([oo_has_virtual,oo_has_constructor,oo_has_destructor]*aktobjectdef.objectoptions<>[]) or (([oo_has_virtual,oo_has_constructor,oo_has_destructor]*current_objectdef.objectoptions<>[]) or
(classtype in [odt_class]) (classtype in [odt_class])
) then ) then
aktobjectdef.insertvmt; current_objectdef.insertvmt;
if is_interface(aktobjectdef) then if is_interface(current_objectdef) then
setinterfacemethodoptions; setinterfacemethodoptions;
{ remove symtable from stack } { remove symtable from stack }
symtablestack.pop(aktobjectdef.symtable); symtablestack.pop(current_objectdef.symtable);
{ return defined objectdef } { return defined objectdef }
result:=aktobjectdef; result:=current_objectdef;
{ restore old state } { restore old state }
aktobjectdef:=oldaktobjectdef; current_objectdef:=oldcurrent_objectdef;
testcurobject:=0; testcurobject:=0;
typecanbeforward:=storetypecanbeforward; typecanbeforward:=storetypecanbeforward;
parse_generic:=old_parse_generic; parse_generic:=old_parse_generic;

22
compiler/ptype.pas
View File

@ -187,9 +187,9 @@ implementation
consume(_RSHARPBRACKET); consume(_RSHARPBRACKET);
{ Special case if we are referencing the current defined object } { Special case if we are referencing the current defined object }
if assigned(aktobjectdef) and if assigned(current_objectdef) and
(aktobjectdef.objname^=uspecializename) then (current_objectdef.objname^=uspecializename) then
tt:=aktobjectdef; tt:=current_objectdef;
{ for units specializations can already be needed in the interface, therefor we { for units specializations can already be needed in the interface, therefor we
will use the global symtable. Programs don't have a globalsymtable and there we will use the global symtable. Programs don't have a globalsymtable and there we
@ -293,15 +293,15 @@ implementation
{ use of current parsed object: { use of current parsed object:
- classes can be used also in classes - classes can be used also in classes
- objects can be parameters } - objects can be parameters }
if assigned(aktobjectdef) and if assigned(current_objectdef) and
(aktobjectdef.objname^=pattern) and (current_objectdef.objname^=pattern) and
( (
(testcurobject=2) or (testcurobject=2) or
is_class_or_interface(aktobjectdef) is_class_or_interface(current_objectdef)
)then )then
begin begin
consume(_ID); consume(_ID);
def:=aktobjectdef; def:=current_objectdef;
exit; exit;
end; end;
{ Use the special searchsym_type that ignores records,objects and { Use the special searchsym_type that ignores records,objects and
@ -489,15 +489,15 @@ implementation
- classes can be used also in classes - classes can be used also in classes
- objects can be parameters } - objects can be parameters }
if (token=_ID) and if (token=_ID) and
assigned(aktobjectdef) and assigned(current_objectdef) and
(aktobjectdef.objname^=pattern) and (current_objectdef.objname^=pattern) and
( (
(testcurobject=2) or (testcurobject=2) or
is_class_or_interface(aktobjectdef) is_class_or_interface(current_objectdef)
)then )then
begin begin
consume(_ID); consume(_ID);
def:=aktobjectdef; def:=current_objectdef;
exit; exit;
end; end;
{ Generate a specialization? } { Generate a specialization? }

4
compiler/symdef.pas
View File

@ -564,7 +564,7 @@ interface
Tdefmatch=(dm_exact,dm_equal,dm_convertl1); Tdefmatch=(dm_exact,dm_equal,dm_convertl1);
var var
aktobjectdef : tobjectdef; { used for private functions check !! } current_objectdef : tobjectdef; { used for private functions check !! }
{ default types } { default types }
generrordef, { error in definition } generrordef, { error in definition }
@ -3864,7 +3864,7 @@ implementation
function tobjectdef.GetTypeName:string; function tobjectdef.GetTypeName:string;
begin begin
if (self <> aktobjectdef) then if (self <> current_objectdef) then
GetTypeName:=typename GetTypeName:=typename
else else
{ in this case we will go in endless recursion, because then } { in this case we will go in endless recursion, because then }

2
compiler/symtable.pas
View File

@ -2186,7 +2186,7 @@ implementation
class_tobject:=nil; class_tobject:=nil;
interface_iunknown:=nil; interface_iunknown:=nil;
rec_tguid:=nil; rec_tguid:=nil;
aktobjectdef:=nil; current_objectdef:=nil;
dupnr:=0; dupnr:=0;
end; end;