Changes in src/ResolvExpr/SatisfyAssertions.cpp [cf32116:b69233ac]

File:

• src/ResolvExpr/SatisfyAssertions.cpp (modified) (5 diffs)

src/ResolvExpr/SatisfyAssertions.cpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Mon Jun 10 17:45:00 2019
-// Last Modified By : Andrew Beach
-// Last Modified On : Tue Oct  1 13:56:00 2019
-// Update Count     : 2
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Mon Jun 10 17:45:00 2019
+// Update Count     : 1
 //
 
@@ -299 +299 @@
                         Cost cost;
 
-                        OutType(
-                                const ast::TypeEnvironment & e, const ast::OpenVarSet & o,
+                        OutType( 
+                                const ast::TypeEnvironment & e, const ast::OpenVarSet & o, 
                                 const std::vector< DeferRef > & as, const ast::SymbolTable & symtab )
                         : env( e ), open( o ), assns( as ), cost( Cost::zero ) {
@@ -306 +306 @@
                                 for ( const DeferRef & assn : assns ) {
                                         // compute conversion cost from satisfying decl to assertion
-                                        cost += computeConversionCost(
-                                                assn.match.adjType, assn.decl->get_type(), false, symtab, env );
-
+                                        cost += computeConversionCost( 
+                                                assn.match.adjType, assn.decl->get_type(), symtab, env );
+                                        
                                         // mark vars+specialization on function-type assertions
-                                        const ast::FunctionType * func =
+                                        const ast::FunctionType * func = 
                                                 GenPoly::getFunctionType( assn.match.cdata.id->get_type() );
                                         if ( ! func ) continue;
@@ -317 +317 @@
                                                 cost.decSpec( specCost( param->get_type() ) );
                                         }
-
+                                        
                                         cost.incVar( func->forall.size() );
-
+                                        
                                         for ( const ast::TypeDecl * td : func->forall ) {
                                                 cost.decSpec( td->assertions.size() );
@@ -329 +329 @@
                 };
 
-                CandidateEnvMerger(
-                        const ast::TypeEnvironment & env, const ast::OpenVarSet & open,
+                CandidateEnvMerger( 
+                        const ast::TypeEnvironment & env, const ast::OpenVarSet & open, 
                         const ast::SymbolTable & syms )
                 : crnt(), envs{ env }, opens{ open }, symtab( syms ) {}