Changes in src/SynTree/ObjectDecl.cc [1cbca6e:974906e2]

File:

• src/SynTree/ObjectDecl.cc (modified) (7 diffs)

src/SynTree/ObjectDecl.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ObjectDecl.cc -- 
+// ObjectDecl.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Sep 29 14:13:01 2015
-// Update Count     : 18
+// Last Modified On : Fri Jan 08 15:29:10 2016
+// Update Count     : 27
 //
 
@@ -19 +19 @@
 #include "Expression.h"
 #include "utility.h"
+#include "Statement.h"
 
 ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, bool isInline, bool isNoreturn )
@@ -24 +25 @@
         set_isInline( isInline );
         set_isNoreturn( isNoreturn );
+        set_ctor( NULL );
 }
 
 ObjectDecl::ObjectDecl( const ObjectDecl &other )
-        : Parent( other ), type( maybeClone( other.type ) ), init( maybeClone( other.init ) ), bitfieldWidth( maybeClone( other.bitfieldWidth ) ) {
+        : Parent( other ), type( maybeClone( other.type ) ), init( maybeClone( other.init ) ), bitfieldWidth( maybeClone( other.bitfieldWidth ) ), ctor( maybeClone( other.ctor ) ) {
 }
 
@@ -34 +36 @@
         delete init;
         delete bitfieldWidth;
+        delete ctor;
 }
 
@@ -58 +61 @@
                 os << " with initializer ";
                 init->print( os, indent );
+                os << std::string(indent, ' ') << "maybeConstructed? " << init->get_maybeConstructed();
         } // if
 
@@ -64 +68 @@
                 bitfieldWidth->print( os );
         } // if
+
+        if ( ctor ) {
+                os << " initially constructed with ";
+                ctor->print( os, indent );
+        } // if
 }
 
@@ -69 +78 @@
 #if 0
         if ( get_mangleName() != "") {
-                os << get_mangleName() << ": "; 
-        } else 
+                os << get_mangleName() << ": ";
+        } else
 #endif
         if ( get_name() != "" ) {