Changeset 68f9c43 for src/ResolvExpr/Alternative.cc

Timestamp:

Mar 16, 2018, 5:15:02 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

8d7bef2

Parents:

6171841

git-author:

Aaron Moss <a3moss@…> (03/16/18 17:04:24)

git-committer:

Aaron Moss <a3moss@…> (03/16/18 17:15:02)

Message:

First pass at delete removal

File:

• src/ResolvExpr/Alternative.cc (modified) (1 diff)

src/ResolvExpr/Alternative.cc

@@ -34 +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 &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( 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;
-        }
-
-        Alternative::~Alternative() {
-                delete expr;
-        }
 
         void Alternative::print( std::ostream &os, Indenter indent ) const {