Changeset 5b2f5bb for src/SynTree

Timestamp:

Mar 30, 2016, 3:48:55 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

e0323a2

Parents:

4cc4286

Message:

choose destructor at at object declaration (CtorInit?), overhaul and simplification of resolver code for CtorInit?

Location:

src/SynTree

Files:

• Initializer.cc (modified) (4 diffs)
• Initializer.h (modified) (3 diffs)

src/SynTree/Initializer.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jan 13 15:31:45 2016
+// Last Modified On : Wed Mar 30 13:58:32 2016
 // Update Count     : 28
 //
@@ -16 +16 @@
 #include "Initializer.h"
 #include "Expression.h"
+#include "Statement.h"
 #include "Common/utility.h"
 
@@ -81 +82 @@
 
 
-ConstructorInit::ConstructorInit( Expression * ctor, Initializer * init ) : Initializer( true ), ctor( ctor ), init( init ) {}
+ConstructorInit::ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init ) : Initializer( true ), ctor( ctor ), dtor( dtor ), init( init ) {}
 ConstructorInit::~ConstructorInit() {
         delete ctor;
@@ -98 +99 @@
         } // if
 
+        if ( dtor ) {
+                os << " destructed with ";
+                dtor->print( os, indent+2 );
+        }
+
         if ( init ) {
                 os << " with fallback C-style initializer: ";

src/SynTree/Initializer.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Feb 09 14:40:15 2016
+// Last Modified On : Wed Mar 30 13:22:08 2016
 // Update Count     : 19
 //
@@ -107 +107 @@
 class ConstructorInit : public Initializer {
   public:
-        ConstructorInit( Expression * ctor, Initializer * init );
+        ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init );
         virtual ~ConstructorInit();
 
-        void set_ctor( Expression * newValue ) { ctor = newValue; }
-        Expression * get_ctor() const { return ctor; }
+        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; }
@@ -121 +123 @@
 
   private:
-        Expression * ctor;
+        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