Changes in src/ResolvExpr/Alternative.cc [aefcc3b:d3b7937]

File:

• src/ResolvExpr/Alternative.cc (modified) (5 diffs)

src/ResolvExpr/Alternative.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Alternative.cc --
+// Alternative.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -12 +12 @@
 // Last Modified On : Sat May 16 23:54:23 2015
 // Update Count     : 2
-//
+// 
 
 #include "Alternative.h"
@@ -20 +20 @@
 
 namespace ResolvExpr {
-        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( 0 ) {}
+        Alternative::Alternative() : expr( 0 ) {}
 
         Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost )
@@ -35 +35 @@
                 if ( &other == this ) return *this;
                 initialize( other, *this );
-                return *this;
-        }
-
-        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( other.env ) {
-                other.expr = nullptr;
-        }
-
-        Alternative & Alternative::operator=( Alternative && other ) {
-                if ( &other == this )  return *this;
-                delete expr;
-                cost = other.cost;
-                cvtCost = other.cvtCost;
-                expr = other.expr;
-                env = other.env;
-                other.expr = nullptr;
                 return *this;
         }
@@ -69 +54 @@
                         expr->print( os, indent );
                         os << "(types:" << std::endl;
-                        os << std::string( indent+4, ' ' );
-                        expr->get_result()->print( os, indent + 4 );
-                        os << std::endl << ")" << std::endl;
+                        printAll( expr->get_results(), os, indent + 4 );
+                        os << ")" << std::endl;
                 } else {
                         os << "Null expression!" << std::endl;