Changes in src/SynTree/Expression.cc [4ffdd63:60089f4]

File:

• src/SynTree/Expression.cc (modified) (6 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 Apr 27 17:07:19 2016
+// Last Modified On : Tue Apr 26 12:52:40 2016
 // Update Count     : 40
 //
@@ -72 +72 @@
 
 void ConstantExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "constant expression " ;
+        os << "constant expression " ;
         constant.print( os );
         Expression::print( os, indent );
@@ -79 +79 @@
 
 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 ) {
@@ -383 +381 @@
 void UntypedExpr::print( std::ostream &os, int indent ) const {
         os << "Applying untyped: " << std::endl;
-        os << std::string( indent, ' ' );
+        os << std::string( indent+4, ' ' );
         function->print(os, indent + 4);
         os << std::string( indent, ' ' ) << "...to: " << std::endl;
-        os << std::string( indent, ' ' );
-        printArgs(os, indent + 4);
+        printAll(args, os, indent + 4);
         Expression::print( os, indent );
 }
@@ -393 +390 @@
 void UntypedExpr::printArgs( std::ostream &os, int indent ) const {
         std::list<Expression *>::const_iterator i;
-        for (i = args.begin(); i != args.end(); i++)
+        for (i = args.begin(); i != args.end(); i++) {
+                os << std::string(indent, ' ' );
                 (*i)->print(os, indent);
+        }
 }
 
@@ -466 +465 @@
 }
 
-
-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.tempDecls, tempDecls );
-        cloneAll( other.returnDecls, returnDecls );
-        cloneAll( other.dtors, dtors );
-}
-
-ImplicitCopyCtorExpr::~ImplicitCopyCtorExpr() {
-        delete callExpr;
-        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 return temporaries:" << std::endl;
-        printAll(returnDecls, os, indent+2);
-        Expression::print( os, indent );
-}
-
 UntypedValofExpr::UntypedValofExpr( const UntypedValofExpr & other ) : Expression( other ), body ( maybeClone( other.body ) ) {}