Changeset 2f86ddf for src/SynTree

Timestamp:

Sep 6, 2018, 10:51:37 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

9b086ca

Parents:

ec42ff2e

Message:

Add Destructor handlers for argument and return temporaries, merge and simplify ResolveCopyCtors/FixCopyCtors passes, simplify ImplicitCopyCtorExpr

Location:

src/SynTree

Files:

• Expression.cc (modified) (3 diffs)
• Expression.h (modified) (1 diff)

src/SynTree/Expression.cc

@@ -538 +538 @@
         assert( callExpr );
         assert( callExpr->result );
-        set_result( callExpr->get_result()->clone() );
+        set_result( callExpr->result->clone() );
 }
 
 ImplicitCopyCtorExpr::ImplicitCopyCtorExpr( const ImplicitCopyCtorExpr & other ) : Expression( other ), callExpr( maybeClone( other.callExpr ) ) {
-        cloneAll( other.tempDecls, tempDecls );
-        cloneAll( other.returnDecls, returnDecls );
-        cloneAll( other.dtors, dtors );
 }
 
@@ -550 +547 @@
         set_env( nullptr ); // ImplicitCopyCtorExpr does not take ownership of an environment
         delete callExpr;
-        deleteAll( tempDecls );
-        deleteAll( returnDecls );
-        deleteAll( dtors );
 }
 
@@ -558 +552 @@
         os <<  "Implicit Copy Constructor Expression: " << std::endl << indent+1;
         callExpr->print( os, indent+1 );
-        os << std::endl << indent << "... with temporaries:" << std::endl;
-        printAll( tempDecls, os, indent+1 );
-        os << std::endl << indent << "... with return temporaries:" << std::endl;
-        printAll( returnDecls, os, indent+1 );
-        Expression::print( os, indent );
 }
 

src/SynTree/Expression.h

@@ -591 +591 @@
 class ImplicitCopyCtorExpr : public Expression {
 public:
-        ApplicationExpr * callExpr;
-        std::list< ObjectDecl * > tempDecls;
-        std::list< ObjectDecl * > returnDecls;
-        std::list< Expression * > dtors;
+        ApplicationExpr * callExpr = nullptr;
 
         ImplicitCopyCtorExpr( ApplicationExpr * callExpr );
         ImplicitCopyCtorExpr( const ImplicitCopyCtorExpr & other );
         virtual ~ImplicitCopyCtorExpr();
-
-        ApplicationExpr * get_callExpr() const { return callExpr; }
-        void set_callExpr( ApplicationExpr * newValue ) { callExpr = newValue; }
-
-        std::list< ObjectDecl * > & get_tempDecls() { return tempDecls; }
-        std::list< ObjectDecl * > & get_returnDecls() { return returnDecls; }
-        std::list< Expression * > & get_dtors() { return dtors; }
 
         virtual ImplicitCopyCtorExpr * clone() const { return new ImplicitCopyCtorExpr( * this ); }