Changes in src/ResolvExpr/Alternative.cc [f6f0cca3:4e7cc5ce]

File:

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

src/ResolvExpr/Alternative.cc

@@ -20 +20 @@
 #include <utility>                       // for move
 
-#include "Common/GC.h"
-#include "Common/PassVisitor.h"
 #include "Common/utility.h"              // for maybeClone
 #include "ResolvExpr/Cost.h"             // for Cost, Cost::zero, operator<<
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
 #include "SynTree/Expression.h"          // for Expression
-#include "SynTree/GcTracer.h"
 #include "SynTree/Type.h"                // for Type
 
 namespace ResolvExpr {
-        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( 0 ) {}
+        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( nullptr ) {}
 
         Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost )
@@ -37 +34 @@
         Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost, const Cost &cvtCost )
                 : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ) {}
-        
-        Alternative::Alternative( const Alternative& o )
-                : cost( o.cost ), cvtCost( o.cvtCost ), expr( maybeClone( o.expr ) ), env( o.env ) {}
-        
-        Alternative & Alternative::operator= ( const Alternative& o ) {
-                if ( &o == this ) return *this;
-                cost = o.cost;
-                cvtCost = o.cvtCost;
-                expr = maybeClone( o.expr );
-                env = o.env;
+
+        Alternative::Alternative( const Alternative &other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( maybeClone( other.expr ) ), env( other.env ) {
+        }
+
+        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;
                 return *this;
+        }
+
+        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( std::move( 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 = std::move( other.env );
+                other.expr = nullptr;
+                return *this;
+        }
+
+        Alternative::~Alternative() {
+                delete expr;
         }
 
@@ -79 +96 @@
         }
 
-        const GC& operator<< ( const GC& gc, const Alternative& alt ) {
-                PassVisitor<GcTracer> tracer{ gc };
-                maybeAccept( alt.expr, tracer );
-                tracer << alt.env;
-                return gc;
-        }
-
 } // namespace ResolvExpr