Changeset 3c6e417 for src/ResolvExpr/Candidate.hpp

Timestamp:

Jun 20, 2019, 1:45:01 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

54dd994

Parents:

1e5dedc4 (diff), c0f9efe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ResolvExpr/Candidate.hpp (modified) (1 diff)

src/ResolvExpr/Candidate.hpp

@@ -53 +53 @@
         : expr( x ), cost( Cost::zero ), cvtCost( Cost::zero ), env( e ), open(), need() {}
 
-        Candidate( const Candidate & o, const ast::Expr * x )
-        : expr( x ), cost( o.cost ), cvtCost( Cost::zero ), env( o.env ), open( o.open ),
+        Candidate( const Candidate & o, const ast::Expr * x, const Cost & addedCost = Cost::zero )
+        : expr( x ), cost( o.cost + addedCost ), cvtCost( Cost::zero ), env( o.env ), open( o.open ),
           need( o.need ) {}
+
+        Candidate(
+                const ast::Expr * x, const ast::TypeEnvironment & e, const ast::OpenVarSet & o, 
+                const ast::AssertionSet & n, const Cost & c, const Cost & cvt = Cost::zero )
+        : expr( x ), cost( c ), cvtCost( cvt ), env( e ), open( o ), need( n.begin(), n.end() ) {}
 
         Candidate(