Changes in src/SynTree/Initializer.h [f1b1e4c:05d47278]

File:

• src/SynTree/Initializer.h (modified) (10 diffs)

src/SynTree/Initializer.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Initializer.h --
+// Initializer.h -- 
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 12 13:49:13 2016
-// Update Count     : 19
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon May 18 09:03:48 2015
+// Update Count     : 1
 //
 
@@ -20 +20 @@
 #include "Visitor.h"
 #include "Mutator.h"
-#include "Type.h"
 
 #include <cassert>
@@ -28 +27 @@
   public:
         //      Initializer( std::string _name = std::string(""), int _pos = 0 );
-        Initializer( bool maybeConstructed );
-        Initializer( const Initializer & other );
+        Initializer( );
         virtual ~Initializer();
 
@@ -45 +43 @@
         }
 
-        bool get_maybeConstructed() { return maybeConstructed; }
-
         virtual Initializer *clone() const = 0;
         virtual void accept( Visitor &v ) = 0;
@@ -54 +50 @@
         //      std::string name;
         //      int pos;
-        bool maybeConstructed;
 };
 
@@ -60 +55 @@
 class SingleInit : public Initializer {
   public:
-        SingleInit( Expression *value, const std::list< Expression *> &designators = std::list< Expression * >(), bool maybeConstructed = false );
+        SingleInit( Expression *value, std::list< Expression *> &designators = *(new std::list<Expression *>()) );
         SingleInit( const SingleInit &other );
         virtual ~SingleInit();
-
+        
         Expression *get_value() { return value; }
         void set_value( Expression *newValue ) { value = newValue; }
@@ -70 +65 @@
         std::list<Expression *> &get_designators() { return designators; }
 
-        virtual SingleInit *clone() const { return new SingleInit( *this); }
+        virtual SingleInit *clone() const;
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
@@ -84 +79 @@
 class ListInit : public Initializer {
   public:
-        ListInit( const std::list<Initializer*> &initializers,
-                          const std::list<Expression *> &designators = std::list< Expression * >(), bool maybeConstructed = false );
+        ListInit( std::list<Initializer*> &, 
+                          std::list<Expression *> &designators = *(new std::list<Expression *>()) );
         virtual ~ListInit();
 
@@ -96 +91 @@
         std::list<Initializer*>::iterator end_initializers() { return initializers.end(); }
 
-        virtual ListInit *clone() const { return new ListInit( *this ); }
+        virtual ListInit *clone() const;
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
@@ -105 +100 @@
 };
 
-// ConstructorInit represents an initializer that is either a constructor expression or
-// a C-style initializer.
-class ConstructorInit : public Initializer {
-  public:
-        ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init );
-        ConstructorInit( const ConstructorInit &other );
-        virtual ~ConstructorInit();
-
-        void set_ctor( Statement * newValue ) { ctor = newValue; }
-        Statement * get_ctor() const { return ctor; }
-        void set_dtor( Statement * newValue ) { dtor = newValue; }
-        Statement * get_dtor() const { return dtor; }
-        void set_init( Initializer * newValue ) { init = newValue; }
-        Initializer * get_init() const { return init; }
-
-        ConstructorInit *clone() const { return new ConstructorInit( *this ); }
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 );
-
-  private:
-        Statement * ctor;
-        Statement * dtor;
-        // C-style initializer made up of SingleInit and ListInit nodes to use as a fallback
-        // if an appropriate constructor definition is not found by the resolver
-        Initializer * init;
-};
-
-std::ostream & operator<<( std::ostream & out, Initializer * init );
-
 #endif // INITIALIZER_H