* rename trtti_attributesdef to trtti_attributes_list

git-svn-id: trunk@42359 -

compiler/ncgrtti.pas

@@ -910,8 +910,8 @@ implementation
                 tcb.emit_ord_const(proctypesinfo,u8inttype);
 
                 { Write property attribute count }
-                if assigned(tpropertysym(sym).rtti_attributesdef) then
-                  attrcount:=tpropertysym(sym).rtti_attributesdef.get_attribute_count
+                if assigned(tpropertysym(sym).rtti_attribute_list) then
+                  attrcount:=tpropertysym(sym).rtti_attribute_list.get_attribute_count
                 else
                   attrcount:=0;
                 tcb.emit_ord_const(attrcount,u8inttype);
@@ -922,7 +922,7 @@ implementation
                 { Write property attributes }
                 for attridx := 0 to attrcount-1 do
                   begin
-                    attr := trtti_attribute(tpropertysym(sym).rtti_attributesdef.rtti_attributes[attridx]);
+                    attr := trtti_attribute(tpropertysym(sym).rtti_attribute_list.rtti_attributes[attridx]);
                     tcb.emit_tai(Tai_const.Createname(attr.symbolname,AT_DATA_FORCEINDIRECT,0), cpointerdef.getreusable(ttypesym(attr.typesym).typedef));
                   end;
                 tcb.end_anonymous_record;
@@ -1752,8 +1752,8 @@ implementation
       idx: byte;
       attr: trtti_attribute;
     begin
-      if (def.typ = objectdef) and (assigned(tobjectdef(def).rtti_attributesdef)) then
-        count:=tobjectdef(def).rtti_attributesdef.get_attribute_count
+      if (def.typ = objectdef) and (assigned(tobjectdef(def).rtti_attribute_list)) then
+        count:=tobjectdef(def).rtti_attribute_list.get_attribute_count
       else
         count:=0;
 
@@ -1762,7 +1762,7 @@ implementation
       if count>0 then
         for idx:=0 to count-1 do
           begin
-            attr := trtti_attribute(tobjectdef(def).rtti_attributesdef.rtti_attributes[idx]);
+            attr := trtti_attribute(tobjectdef(def).rtti_attribute_list.rtti_attributes[idx]);
             tcb.emit_tai(Tai_const.Createname(attr.symbolname,AT_DATA_FORCEINDIRECT,0), cpointerdef.getreusable(ttypesym(attr.typesym).typedef));
           end;
       end;

compiler/pdecl.pas

@@ -41,13 +41,13 @@ interface
     procedure consts_dec(in_structure, allow_typed_const: boolean;out had_generic:boolean);
     procedure label_dec;
     procedure type_dec(out had_generic:boolean);
-    procedure types_dec(in_structure: boolean;out had_generic:boolean;var rtti_attrs_def: trtti_attributesdef);
+    procedure types_dec(in_structure: boolean;out had_generic:boolean;var rtti_attrs_def: trtti_attribute_list);
     procedure var_dec(out had_generic:boolean);
     procedure threadvar_dec(out had_generic:boolean);
     procedure property_dec;
     procedure resourcestring_dec(out had_generic:boolean);
-    procedure parse_rttiattributes(var rtti_attrs_def: trtti_attributesdef);
-    procedure add_synthetic_rtti_funtion_declarations(rtti_attrs_def: trtti_attributesdef; name: shortstring);
+    procedure parse_rttiattributes(var rtti_attrs_def: trtti_attribute_list);
+    procedure add_synthetic_rtti_funtion_declarations(rtti_attrs_def: trtti_attribute_list; name: shortstring);
 
 implementation
 
@@ -435,7 +435,7 @@ implementation
          internalerror(2012111101);
       end;
 
-    procedure parse_rttiattributes(var rtti_attrs_def: trtti_attributesdef);
+    procedure parse_rttiattributes(var rtti_attrs_def: trtti_attribute_list);
       var
         p, p1: tnode;
         again: boolean;
@@ -482,7 +482,7 @@ implementation
             { Add attribute to attribute list which will be added
               to the property which is defined next. }
             if not assigned(rtti_attrs_def) then
-              rtti_attrs_def := trtti_attributesdef.create;
+              rtti_attrs_def := trtti_attribute_list.create;
             rtti_attrs_def.addattribute(typeSym,p1);
 
             Include(current_module.rtti_options, rmo_hasattributes);
@@ -493,7 +493,7 @@ implementation
         consume(_RECKKLAMMER);
       end;
 
-  procedure add_synthetic_rtti_funtion_declarations(rtti_attrs_def: trtti_attributesdef; name: shortstring);
+  procedure add_synthetic_rtti_funtion_declarations(rtti_attrs_def: trtti_attribute_list; name: shortstring);
     var
       i: Integer;
       sstate: tscannerstate;
@@ -515,7 +515,7 @@ implementation
         end;
     end;
 
-    procedure types_dec(in_structure: boolean;out had_generic:boolean;var rtti_attrs_def: trtti_attributesdef);
+    procedure types_dec(in_structure: boolean;out had_generic:boolean;var rtti_attrs_def: trtti_attribute_list);
 
       function determine_generic_def(name:tidstring):tstoreddef;
         var
@@ -1027,7 +1027,7 @@ implementation
                     if assigned(rtti_attrs_def) then
                       begin
                         add_synthetic_rtti_funtion_declarations(rtti_attrs_def,hdef.typesym.Name);
-                        tobjectdef(hdef).rtti_attributesdef:=rtti_attrs_def;
+                        tobjectdef(hdef).rtti_attribute_list:=rtti_attrs_def;
                         rtti_attrs_def := nil;
                       end;
 
@@ -1108,7 +1108,7 @@ implementation
     { reads a type declaration to the symbol table }
     procedure type_dec(out had_generic:boolean);
       var
-        rtti_attrs_def: trtti_attributesdef;
+        rtti_attrs_def: trtti_attribute_list;
       begin
         consume(_TYPE);
         rtti_attrs_def := nil;

compiler/pdecobj.pas

@@ -39,7 +39,7 @@ interface
     function class_destructor_head(astruct: tabstractrecorddef):tprocdef;
     function constructor_head:tprocdef;
     function destructor_head:tprocdef;
-    procedure struct_property_dec(is_classproperty:boolean;var rtti_attrs_def: trtti_attributesdef);
+    procedure struct_property_dec(is_classproperty:boolean;var rtti_attrs_def: trtti_attribute_list);
 
 implementation
 
@@ -162,7 +162,7 @@ implementation
       end;
 
 
-    procedure struct_property_dec(is_classproperty:boolean;var rtti_attrs_def: trtti_attributesdef);
+    procedure struct_property_dec(is_classproperty:boolean;var rtti_attrs_def: trtti_attribute_list);
       var
         p : tpropertysym;
       begin
@@ -217,7 +217,7 @@ implementation
         if assigned(rtti_attrs_def) then
           begin
             add_synthetic_rtti_funtion_declarations(rtti_attrs_def,current_structdef.RttiName+'_'+p.RealName);
-            p.rtti_attributesdef := rtti_attrs_def;
+            p.rtti_attribute_list := rtti_attrs_def;
             rtti_attrs_def:=nil;
           end;
 
@@ -1063,7 +1063,7 @@ implementation
         threadvar_fields : boolean;
         vdoptions: tvar_dec_options;
         fieldlist: tfpobjectlist;
-        rtti_attrs_def: trtti_attributesdef;
+        rtti_attrs_def: trtti_attribute_list;
 
 
       procedure parse_const;

compiler/ptype.pas

@@ -677,7 +677,7 @@ implementation
         hadgeneric,
         fields_allowed, is_classdef, classfields, threadvarfields: boolean;
         vdoptions: tvar_dec_options;
-        rtti_attrs_def: trtti_attributesdef;
+        rtti_attrs_def: trtti_attribute_list;
       begin
         { empty record declaration ? }
         if (token=_SEMICOLON) then

compiler/symdef.pas

@@ -392,7 +392,7 @@ interface
        end;
        pvmtentry = ^tvmtentry;
 
-        { trtti_attributesdef }
+       { trtti_attribute_list }
 
        trtti_attribute = class
           typesym         : tsym;
@@ -400,7 +400,7 @@ interface
           symbolname      : string;
        end;
 
-       trtti_attributesdef = class
+       trtti_attribute_list = class
           rtti_attributes    : TFPObjectList;
           procedure addattribute(atypesym: tsym; constructorcall: tnode);
           destructor destroy; override;
@@ -453,7 +453,7 @@ interface
           }
           classref_created_in_current_module : boolean;
           objecttype     : tobjecttyp;
-          rtti_attributesdef : trtti_attributesdef;
+          rtti_attribute_list : trtti_attribute_list;
           constructor create(ot:tobjecttyp;const n:string;c:tobjectdef;doregister:boolean);virtual;
           constructor ppuload(ppufile:tcompilerppufile);
           destructor  destroy;override;
@@ -2884,10 +2884,10 @@ implementation
       end;
 
 {****************************************************************************
-                             TRTTI_ATTRIBUTESDEF
+                             TRTTI_ATTRIBUTE_LIST
 ****************************************************************************}
 
-    procedure trtti_attributesdef.addattribute(atypesym: tsym; constructorcall: tnode);
+    procedure trtti_attribute_list.addattribute(atypesym: tsym; constructorcall: tnode);
       var
         newattribute: trtti_attribute;
       begin
@@ -2899,13 +2899,13 @@ implementation
         rtti_attributes.Add(newattribute);
       end;
 
-    destructor trtti_attributesdef.destroy;
+    destructor trtti_attribute_list.destroy;
       begin
         rtti_attributes.Free;
         inherited destroy;
       end;
 
-    function trtti_attributesdef.get_attribute_count: longint;
+    function trtti_attribute_list.get_attribute_count: longint;
       begin
         if assigned(rtti_attributes) then
           result := rtti_attributes.Count
@@ -7025,10 +7025,10 @@ implementation
              freemem(vmcallstaticinfo);
              vmcallstaticinfo:=nil;
            end;
-         if assigned(rtti_attributesdef) then
+         if assigned(rtti_attribute_list) then
            begin
-             rtti_attributesdef.Free;
-             rtti_attributesdef:=nil;
+             rtti_attribute_list.Free;
+             rtti_attribute_list:=nil;
            end;
          inherited destroy;
       end;

compiler/symsym.pas

@@ -352,7 +352,7 @@ interface
           dispid        : longint;
           propaccesslist: array[tpropaccesslisttypes] of tpropaccesslist;
           parast : tsymtable;
-          rtti_attributesdef : trtti_attributesdef;
+          rtti_attribute_list : trtti_attribute_list;
           constructor create(const n : string);virtual;
           destructor  destroy;override;
           constructor ppuload(ppufile:tcompilerppufile);
@@ -1376,7 +1376,7 @@ implementation
          for pap:=low(tpropaccesslisttypes) to high(tpropaccesslisttypes) do
            propaccesslist[pap].free;
          parast.free;
-         rtti_attributesdef.free;
+         rtti_attribute_list.free;
          inherited destroy;
       end;