Changes in src/SynTree/Initializer.h [843054c2:4d2434a]

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 : Peter A. Buhr
-// Last Modified On : Mon May 18 09:03:48 2015
-// Update Count     : 1
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Apr 12 13:49:13 2016
+// Update Count     : 19
 //
 
@@ -20 +20 @@
 #include "Visitor.h"
 #include "Mutator.h"
+#include "Type.h"
 
 #include <cassert>
@@ -27 +28 @@
   public:
         //      Initializer( std::string _name = std::string(""), int _pos = 0 );
-        Initializer( );
+        Initializer( bool maybeConstructed );
+        Initializer( const Initializer & other );
         virtual ~Initializer();
 
@@ -43 +45 @@
         }
 
+        bool get_maybeConstructed() { return maybeConstructed; }
+
         virtual Initializer *clone() const = 0;
         virtual void accept( Visitor &v ) = 0;
@@ -50 +54 @@
         //      std::string name;
         //      int pos;
+        bool maybeConstructed;
 };
 
@@ -55 +60 @@
 class SingleInit : public Initializer {
   public:
-        SingleInit( Expression *value, std::list< Expression *> &designators );
+        SingleInit( Expression *value, const std::list< Expression *> &designators = std::list< Expression * >(), bool maybeConstructed = false );
         SingleInit( const SingleInit &other );
         virtual ~SingleInit();
-        
+
         Expression *get_value() { return value; }
         void set_value( Expression *newValue ) { value = newValue; }
@@ -65 +70 @@
         std::list<Expression *> &get_designators() { return designators; }
 
-        virtual SingleInit *clone() const;
+        virtual SingleInit *clone() const { return new SingleInit( *this); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
@@ -79 +84 @@
 class ListInit : public Initializer {
   public:
-        ListInit( std::list<Initializer*> &, 
-                          std::list<Expression *> &designators = *(new std::list<Expression *>()) );
+        ListInit( const std::list<Initializer*> &initializers,
+                          const std::list<Expression *> &designators = std::list< Expression * >(), bool maybeConstructed = false );
         virtual ~ListInit();
 
@@ -88 +93 @@
         std::list<Initializer*> &get_initializers() { return initializers; }
 
-        std::list<Initializer*>::iterator begin_initializers() { return initializers.begin(); }
-        std::list<Initializer*>::iterator end_initializers() { return initializers.end(); }
+        typedef std::list<Initializer*>::iterator iterator;
+        iterator begin() { return initializers.begin(); }
+        iterator end() { return initializers.end(); }
 
-        virtual ListInit *clone() const;
+        virtual ListInit *clone() const { return new ListInit( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
@@ -100 +106 @@
 };
 
+// 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