Changeset 6d6e829 for src/ResolvExpr/Alternative.cc

Timestamp:

Oct 12, 2018, 3:19:35 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

da48183

Parents:

59cf83b

Message:

First compiling draft of deferred assertions (build failure)

File:

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

src/ResolvExpr/Alternative.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:44:23 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 23:54:23 2015
-// Update Count     : 2
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Thu Oct 11 10:55:00 2018
+// Update Count     : 3
 //
 
@@ -27 +27 @@
 
 namespace ResolvExpr {
-        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( nullptr ) {}
+        Alternative::Alternative() 
+        : cost( Cost::zero ), cvtCost( Cost::zero ), expr( nullptr ), env(), openVars(), need() {}
 
-        Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost )
-                : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( env ) {}
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env )
+        : cost( Cost::zero ), cvtCost( Cost::zero ), expr( expr ), env( env ), openVars(), need() {}
+        
+        Alternative::Alternative( const Alternative &o, Expression *expr, const Cost &cost ) 
+        : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( o.env ), openVars( o.openVars ), 
+          need( o.need ) {}
 
-        Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost, const Cost &cvtCost )
-                : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ) {}
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env, 
+                const OpenVarSet& openVars, const AssertionList& need, const Cost& cost )
+        : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( env ), openVars( openVars ), 
+          need( need ) {}
 
-        Alternative::Alternative( const Alternative &other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( maybeClone( other.expr ) ), env( other.env ) {
-        }
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env, 
+                const OpenVarSet& openVars, const AssertionList& need, const Cost& cost, 
+                const Cost &cvtCost )
+        : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ), openVars( openVars ), 
+          need( need ) {}
+
+        Alternative::Alternative( const Alternative &other ) 
+        : cost( other.cost ), cvtCost( other.cvtCost ), expr( maybeClone( other.expr ) ), 
+          env( other.env ), openVars( other.openVars ), need( other.need ) {}
 
         Alternative &Alternative::operator=( const Alternative &other ) {
@@ -45 +59 @@
                 expr = maybeClone( other.expr );
                 env = other.env;
+                openVars = other.openVars;
+                need = other.need;
                 return *this;
         }
 
-        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( std::move( other.env ) ) {
+        Alternative::Alternative( Alternative && other ) 
+        : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), 
+          env( std::move( other.env ) ), openVars( std::move( other.openVars ) ), 
+          need( std::move( other.need ) ) {
                 other.expr = nullptr;
         }
@@ -59 +78 @@
                 expr = other.expr;
                 env = std::move( other.env );
+                openVars = std::move( other.openVars );
+                need = std::move( other.need );
                 other.expr = nullptr;
                 return *this;