Changes in src/SynTree/Expression.cc [2f86ddf:07ec1a2]

File:

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

src/SynTree/Expression.cc

@@ -376 +376 @@
         os << "Untyped Member Expression, with field: " << std::endl << indent+1;
         member->print(os, indent+1 );
-        os << indent << "... from aggregate: " << std::endl << indent+1;
+        os << indent << "... from aggregate:" << std::endl << indent+1;
         aggregate->print(os, indent+1);
         Expression::print( os, indent );
@@ -405 +405 @@
 
 void MemberExpr::print( std::ostream &os, Indenter indent ) const {
-        os << "Member Expression, with field: " << std::endl;
+        os << "Member Expression, with field:" << std::endl;
         os << indent+1;
         member->print( os, indent+1 );
-        os << std::endl << indent << "... from aggregate: " << std::endl << indent+1;
+        os << std::endl << indent << "... from aggregate:" << std::endl << indent+1;
         aggregate->print(os, indent + 1);
         Expression::print( os, indent );
@@ -456 +456 @@
 
 void UntypedExpr::print( std::ostream &os, Indenter indent ) const {
-        os << "Applying untyped: " << std::endl;
+        os << "Applying untyped:" << std::endl;
         os << indent+1;
         function->print(os, indent+1);
-        os << std::endl << indent << "...to: " << std::endl;
+        os << std::endl << indent << "...to:" << std::endl;
         printAll(args, os, indent+1);
         Expression::print( os, indent );
@@ -538 +538 @@
         assert( callExpr );
         assert( callExpr->result );
-        set_result( callExpr->result->clone() );
+        set_result( callExpr->get_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 );
 }
 
@@ -547 +550 @@
         set_env( nullptr ); // ImplicitCopyCtorExpr does not take ownership of an environment
         delete callExpr;
+        deleteAll( tempDecls );
+        deleteAll( returnDecls );
+        deleteAll( dtors );
 }
 
@@ -552 +558 @@
         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 );
 }