Changeset 43e0949 for src/SynTree

Timestamp:

Feb 19, 2019, 1:19:47 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

no_list

Children:

2f42718

Parents:

99614c2

Message:

more lists converted to vectors

Location:

src/SynTree

Files:

• Initializer.cc (modified) (1 diff)
• Initializer.h (modified) (3 diffs)

src/SynTree/Initializer.cc

@@ -70 +70 @@
 
 
-ListInit::ListInit( const std::vector< Initializer * > &inits, const std::list<Designation *> &des, bool maybeConstructed )
+ListInit::ListInit( const std::vector< Initializer * > & inits, const std::vector<Designation *> & des, bool maybeConstructed )
         : Initializer( maybeConstructed ), initializers( inits ), designations( des ) {
                 // handle the common case where a ListInit is created without designations by making a list of empty designations with the same length as the initializer

src/SynTree/Initializer.h

@@ -36 +36 @@
         virtual ~Designation();
 
-        std::list< Expression * > & get_designators() { return designators; }
-
         virtual Designation * clone() const override { return new Designation( *this ); };
         virtual void accept( Visitor &v ) override { v.visit( this ); }
@@ -44 +42 @@
 };
 
-const std::list<Designation *> noDesignators;
+const std::vector<Designation *> noDesignators;
 
 // Initializer: base class for object initializers (provide default values)
@@ -87 +85 @@
   public:
         std::vector< Initializer * > initializers;  // order *is* important
-        std::list<Designation *> designations;  // order/length is consistent with initializers
+        std::vector<Designation *> designations;  // order/length is consistent with initializers
 
         ListInit( const std::vector< Initializer * > &initializers,
-                          const std::list<Designation *> &designators = {}, bool maybeConstructed = false );
+                          const std::vector<Designation *> &designators = {}, bool maybeConstructed = false );
         ListInit( const ListInit & other );
         virtual ~ListInit();
-
-        std::list<Designation *> & get_designations() { return designations; }
-        std::vector< Initializer * > & get_initializers() { return initializers; }
 
         typedef std::vector< Initializer * >::iterator iterator;