Changeset d5556a3 for src/SynTree/Expression.cc

Timestamp:

Dec 13, 2016, 5:37:15 PM (9 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:

31f379c

Parents:

1d2b64f

Message:

change rework TupleAssignExpr and StmtExpr

File:

• src/SynTree/Expression.cc (modified) (6 diffs)

src/SynTree/Expression.cc

@@ -524 +524 @@
 
 ImplicitCopyCtorExpr::~ImplicitCopyCtorExpr() {
+        set_env( nullptr ); // ImplicitCopyCtorExpr does not take ownership of an environment
         delete callExpr;
         deleteAll( tempDecls );
@@ -533 +534 @@
         os <<  "Implicit Copy Constructor Expression: " << std::endl;
         assert( callExpr );
+        os << std::string( indent+2, ' ' );
         callExpr->print( os, indent + 2 );
         os << std::endl << std::string( indent, ' ' ) << "with temporaries:" << std::endl;
@@ -584 +586 @@
         os << std::string( indent+2, ' ' );
         initializer->print( os, indent + 2 );
+        Expression::print( os, indent );
 }
 
@@ -603 +606 @@
         os << " ... ";
         high->print( os, indent );
+        Expression::print( os, indent );
 }
 
@@ -614 +618 @@
         }
 }
-StmtExpr::StmtExpr( const StmtExpr &other ) : Expression( other ), statements( other.statements->clone() ) {}
+StmtExpr::StmtExpr( const StmtExpr &other ) : Expression( other ), statements( other.statements->clone() ) {
+        cloneAll( other.returnDecls, returnDecls );
+        cloneAll( other.dtors, dtors );
+}
 StmtExpr::~StmtExpr() {
         delete statements;
+        deleteAll( dtors );
+        deleteAll( returnDecls );
 }
 void StmtExpr::print( std::ostream &os, int indent ) const {
         os << "Statement Expression: " << std::endl << std::string( indent, ' ' );
         statements->print( os, indent+2 );
+        if ( ! returnDecls.empty() ) {
+                os << std::string( indent+2, ' ' ) << "with returnDecls: ";
+                printAll( returnDecls, os, indent+2 );
+        }
+        if ( ! dtors.empty() ) {
+                os << std::string( indent+2, ' ' ) << "with dtors: ";
+                printAll( dtors, os, indent+2 );
+        }
+        Expression::print( os, indent );
 }
 
@@ -644 +662 @@
         get_expr()->print( os, indent+2 );
         if ( get_object() ) {
-                os << " with decl: ";
+                os << std::string( indent+2, ' ' ) << "with decl: ";
                 get_object()->printShort( os, indent+2 );
         }
+        Expression::print( os, indent );
 }