Changes in src/SynTree/Initializer.cc [d3b7937:84bb4d9]

File:

• src/SynTree/Initializer.cc (modified) (4 diffs)

src/SynTree/Initializer.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Initializer.cc -- 
+// Initializer.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 14:05:25 2015
-// Update Count     : 14
+// Last Modified On : Tue Apr 26 15:51:35 2016
+// Update Count     : 28
 //
 
 #include "Initializer.h"
 #include "Expression.h"
+#include "Statement.h"
 #include "Common/utility.h"
 
-Initializer::Initializer() {}
+Initializer::Initializer( bool maybeConstructed ) : maybeConstructed( maybeConstructed ) {}
 
 Initializer::~Initializer() {}
@@ -31 +32 @@
 void Initializer::print( std::ostream &os, int indent ) {}
 
-SingleInit::SingleInit( Expression *v, std::list< Expression *> &_designators ) : value ( v ), designators( _designators ) { 
+SingleInit::SingleInit( Expression *v, const std::list< Expression *> &_designators, bool maybeConstructed ) : Initializer( maybeConstructed ), value ( v ), designators( _designators ) {
 }
 
-SingleInit::SingleInit( const SingleInit &other ) : value ( other.value ) {
+SingleInit::SingleInit( const SingleInit &other ) : Initializer(other), value ( maybeClone( other.value ) ) {
         cloneAll(other.designators, designators );
 }
@@ -54 +55 @@
 }
 
-ListInit::ListInit( std::list<Initializer*> &_initializers, std::list<Expression *> &_designators )
-        : initializers( _initializers ), designators( _designators ) {
+ListInit::ListInit( const std::list<Initializer*> &_initializers, const std::list<Expression *> &_designators, bool maybeConstructed )
+        : Initializer( maybeConstructed), initializers( _initializers ), designators( _designators ) {
 }
 
@@ -65 +66 @@
 
 void ListInit::print( std::ostream &os, int indent ) {
-        os << std::endl << std::string(indent, ' ') << "Compound initializer:  "; 
+        os << std::endl << std::string(indent, ' ') << "Compound initializer:  ";
         if ( ! designators.empty() ) {
                 os << std::string(indent + 2, ' ' ) << "designated by: [";
                 for ( std::list < Expression * >::iterator i = designators.begin();
                           i != designators.end(); i++ ) {
-                        ( *i )->print(os, indent + 4 ); 
+                        ( *i )->print(os, indent + 4 );
                 } // for
-        
+
                 os << std::string(indent + 2, ' ' ) << "]";
         } // if
 
-        for ( std::list<Initializer *>::iterator i = initializers.begin(); i != initializers.end(); i++ ) 
+        for ( std::list<Initializer *>::iterator i = initializers.begin(); i != initializers.end(); i++ )
                 (*i)->print( os, indent + 2 );
 }
+
+
+ConstructorInit::ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init ) : Initializer( true ), ctor( ctor ), dtor( dtor ), init( init ) {}
+ConstructorInit::~ConstructorInit() {
+        delete ctor;
+        delete init;
+}
+
+ConstructorInit *ConstructorInit::clone() const {
+        return new ConstructorInit( *this );
+}
+
+void ConstructorInit::print( std::ostream &os, int indent ) {
+        os << std::endl << std::string(indent, ' ') << "Constructor initializer: " << std::endl;
+        if ( ctor ) {
+                os << std::string(indent+2, ' ');
+                os << "initially constructed with ";
+                ctor->print( os, indent+4 );
+        } // if
+
+        if ( dtor ) {
+                os << std::string(indent+2, ' ');
+                os << "destructed with ";
+                dtor->print( os, indent+4 );
+        }
+
+        if ( init ) {
+                os << std::string(indent+2, ' ');
+                os << "with fallback C-style initializer: ";
+                init->print( os, indent+4 );
+        }
+}
+
+std::ostream & operator<<( std::ostream & out, Initializer * init ) {
+        init->print( out );
+        return out;
+}
+
 // Local Variables: //
 // tab-width: 4 //