Changes in src/ResolvExpr/Alternative.cc [50377a4:ea6332d]

File:

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

src/ResolvExpr/Alternative.cc

@@ -34 +34 @@
                 : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ) {}
 
-        Alternative::Alternative( const Alternative &other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( maybeClone( other.expr ) ), env( other.env ) {
+        Alternative::Alternative( const Alternative &other ) {
+                initialize( other, *this );
         }
 
         Alternative &Alternative::operator=( const Alternative &other ) {
                 if ( &other == this ) return *this;
-                delete expr;
-                cost = other.cost;
-                cvtCost = other.cvtCost;
-                expr = maybeClone( other.expr );
-                env = other.env;
+                initialize( other, *this );
                 return *this;
         }
@@ -62 +59 @@
         }
 
+        void Alternative::initialize( const Alternative &src, Alternative &dest ) {
+                dest.cost = src.cost;
+                dest.cvtCost = src.cvtCost;
+                dest.expr = maybeClone( src.expr );
+                dest.env = src.env;
+        }
+
         Alternative::~Alternative() {
                 delete expr;
         }
 
-        void Alternative::print( std::ostream &os, Indenter indent ) const {
-                os << "Cost " << cost << ": ";
+        void Alternative::print( std::ostream &os, int indent ) const {
+                os << std::string( indent, ' ' ) << "Cost " << cost << ": ";
                 if ( expr ) {
-                        expr->print( os, indent+1 );
-                        os << std::endl << indent << "(types:" << std::endl;
-                        os << indent+1;
-                        expr->result->print( os, indent+1 );
-                        os << std::endl << indent << ")" << std::endl;
+                        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;
                 } else {
                         os << "Null expression!" << std::endl;
                 } // if
-                os << indent << "Environment: ";
-                env.print( os, indent+1 );
+                os << std::string( indent, ' ' ) << "Environment: ";
+                env.print( os, indent+2 );
                 os << std::endl;
         }