Changeset 77971f6 for src/SynTree

Timestamp:

Oct 27, 2016, 3:24:02 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

3f0c6a5

Parents:

a1e67dd

git-author:

Rob Schluntz <rschlunt@…> (10/27/16 15:11:00)

git-committer:

Rob Schluntz <rschlunt@…> (10/27/16 15:24:02)

Message:

resolve ctor/dtors for UniqueExprs?

Location:

src/SynTree

Files:

• Expression.cc (modified) (3 diffs)
• Expression.h (modified) (2 diffs)

src/SynTree/Expression.cc

@@ -581 +581 @@
 
 long long UniqueExpr::count = 0;
-UniqueExpr::UniqueExpr( Expression *expr, long long idVal ) : expr( new Expression* ), id( idVal ) {
+UniqueExpr::UniqueExpr( Expression *expr, long long idVal ) : expr( new Expression* ), object( new ObjectDecl* ), id( idVal ) {
         assert( count != -1 );
         if ( id == -1 ) id = count++;
@@ -589 +589 @@
                 set_result( expr->get_result()->clone() );
         }
-}
-UniqueExpr::UniqueExpr( const UniqueExpr &other ) : Expression( other ), expr( other.expr ), id( other.id ) {
+        set_object( nullptr );
+}
+UniqueExpr::UniqueExpr( const UniqueExpr &other ) : Expression( other ), expr( other.expr ), object( other.object ), id( other.id ) {
 }
 UniqueExpr::~UniqueExpr() {
@@ -596 +597 @@
                 delete *expr;
         }
+        if ( object.unique() ) {
+                delete *object;
+        }
 }
 void UniqueExpr::print( std::ostream &os, int indent ) const {
         os << "Unique Expression with id:" << id << std::endl << std::string( indent+2, ' ' );
         get_expr()->print( os, indent+2 );
+        if ( get_object() ) {
+                os << " with decl: ";
+                get_object()->printShort( os, indent+2 );
+        }
 }
 

src/SynTree/Expression.h

@@ -742 +742 @@
         UniqueExpr * set_expr( Expression * newValue ) { *expr = newValue; return this; }
 
+        ObjectDecl * get_object() const { return *object; }
+        UniqueExpr * set_object( ObjectDecl * newValue ) { *object = newValue; return this; }
+
         int get_id() const { return id; }
 
@@ -750 +753 @@
 private:
         std::shared_ptr< Expression * > expr;
+        std::shared_ptr< ObjectDecl * > object;
         int id;
         static long long count;