Changeset 89be1c68 for src/ResolvExpr/Alternative.cc

Timestamp:

Jul 17, 2017, 2:35:52 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

7ebaa56

Parents:

b46e3bd

Message:

Remove Cost constructors, use only named members

This change makes it easier to read code involving costs, since in almost every case, only a single part of the cost tuple is relevant. Furthermore, this change makes it much simpler to add another dimension to the cost tuple, since only Cost.h needs to be updated, rather than every location using the cost constructor.

File:

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

src/ResolvExpr/Alternative.cc

@@ -28 +28 @@
                 : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ) {}
 
-        Alternative::Alternative( const Alternative &other ) {
-                initialize( other, *this );
+        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;
-                initialize( other, *this );
+                delete expr;
+                cost = other.cost;
+                cvtCost = other.cvtCost;
+                expr = maybeClone( other.expr );
+                env = other.env;
                 return *this;
         }
@@ -51 +54 @@
                 other.expr = nullptr;
                 return *this;
-        }
-
-        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;
         }