Changeset db4ecc5 for src/SynTree/Expression.cc

Timestamp:

Apr 14, 2016, 3:22:42 PM (10 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:

70a06f6

Parents:

7eabc25

Message:

add ImplicitCopyCtorExpr node, implicit copy constructors are inserted into the right places (but there is room for elision)

File:

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

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Dec 09 14:10:29 2015
+// Last Modified On : Thu Apr 14 13:02:28 2016
 // Update Count     : 34
 //
@@ -78 +78 @@
 
 VariableExpr::VariableExpr( DeclarationWithType *_var, Expression *_aname ) : Expression( _aname ), var( _var ) {
+        assert( var );
+        assert( var->get_type() );
         add_result( var->get_type()->clone() );
         for ( std::list< Type* >::iterator i = get_results().begin(); i != get_results().end(); ++i ) {
@@ -432 +434 @@
 }
 
+
+ImplicitCopyCtorExpr::ImplicitCopyCtorExpr( ApplicationExpr * callExpr ) : callExpr( callExpr ) {
+        assert( callExpr );
+        cloneAll( callExpr->get_results(), results );
+}
+
+ImplicitCopyCtorExpr::ImplicitCopyCtorExpr( const ImplicitCopyCtorExpr & other ) : Expression( other ), callExpr( maybeClone( other.callExpr ) ) {
+        cloneAll( other.results, results );
+        cloneAll( other.copyCtors, copyCtors );
+        cloneAll( other.tempDecls, tempDecls );
+        cloneAll( other.returnDecls, returnDecls );
+        cloneAll( other.dtors, dtors );
+}
+
+ImplicitCopyCtorExpr::~ImplicitCopyCtorExpr() {
+        delete callExpr;
+        deleteAll( copyCtors );
+        deleteAll( tempDecls );
+        deleteAll( returnDecls );
+        deleteAll( dtors );
+}
+
+void ImplicitCopyCtorExpr::print( std::ostream &os, int indent ) const {
+        os << std::string( indent, ' ' ) <<  "Implicit Copy Constructor Expression: " << std::endl;
+        assert( callExpr );
+        callExpr->print( os, indent + 2 );
+        os << std::endl << std::string( indent, ' ' ) << "with temporaries:" << std::endl;
+        printAll(tempDecls, os, indent+2);
+        os << std::endl << std::string( indent, ' ' ) << "with copyCtors:" << std::endl;
+        printAll(copyCtors, os, indent+2);
+        Expression::print( os, indent );
+}
+
 UntypedValofExpr::UntypedValofExpr( const UntypedValofExpr & other ) : Expression( other ), body ( maybeClone( other.body ) ) {}