Changeset 6a1dfda for src/ResolvExpr/Candidate.hpp

Timestamp:

Jun 13, 2019, 8:41:11 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

c36298d

Parents:

dc5072f (diff), 6896548 (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.

git-author:

Peter A. Buhr <pabuhr@…> (06/13/19 20:39:34)

git-committer:

Peter A. Buhr <pabuhr@…> (06/13/19 20:41:11)

Message:

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

File:

• src/ResolvExpr/Candidate.hpp (modified) (2 diffs)

src/ResolvExpr/Candidate.hpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed Jun 5 14:30:00 2019
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Wed Jun 5 14:30:00 2019
-// Update Count     : 1
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 12 14:15:00 2019
+// Update Count     : 2
 //
 
@@ -49 +49 @@
 
         Candidate() : expr(), cost( Cost::zero ), cvtCost( Cost::zero ), env(), open(), need() {}
-        
+
         Candidate( const ast::Expr * x, const ast::TypeEnvironment & e )
         : 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 ), 
+        : expr( x ), cost( o.cost ), cvtCost( Cost::zero ), env( o.env ), open( o.open ),
           need( o.need ) {}
-        
-        Candidate( 
-                const ast::Expr * x, ast::TypeEnvironment && e, ast::OpenVarSet && o, 
-                ast::AssertionSet && n, const Cost & c )
-        : expr( x ), cost( c ), cvtCost( Cost::zero ), env( std::move( e ) ), open( std::move( o ) ), 
+
+        Candidate(
+                const ast::Expr * x, ast::TypeEnvironment && e, ast::OpenVarSet && o,
+                ast::AssertionSet && n, const Cost & c, const Cost & cvt = Cost::zero )
+        : expr( x ), cost( c ), cvtCost( cvt ), env( std::move( e ) ), open( std::move( o ) ),
           need( n.begin(), n.end() ) {}
 };