Changes in src/ResolvExpr/CandidateFinder.cpp [17a0ede2:b69233ac]

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (3 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -66 +66 @@
 UniqueId globalResnSlot = 0;
 
+Cost computeConversionCost( 
+        const ast::Type * argType, const ast::Type * paramType, const ast::SymbolTable & symtab, 
+        const ast::TypeEnvironment & env 
+) {
+        PRINT(
+                std::cerr << std::endl << "converting ";
+                ast::print( std::cerr, argType, 2 );
+                std::cerr << std::endl << " to ";
+                ast::print( std::cerr, paramType, 2 );
+                std::cerr << std::endl << "environment is: ";
+                ast::print( std::cerr, env, 2 );
+                std::cerr << std::endl;
+        )
+        Cost convCost = conversionCost( argType, paramType, symtab, env );
+        PRINT(
+                std::cerr << std::endl << "cost is " << convCost << std::endl;
+        )
+        if ( convCost == Cost::infinity ) return convCost;
+        convCost.incPoly( polyCost( paramType, symtab, env ) + polyCost( argType, symtab, env ) );
+        PRINT(
+                std::cerr << "cost with polycost is " << convCost << std::endl;
+        )
+        return convCost;
+}
+
 namespace {
         /// First index is which argument, second is which alternative, third is which exploded element
@@ -84 +109 @@
                 }
                 return out;
-        }
-
-        /// Computes conversion cost between two types
-        Cost computeConversionCost( 
-                const ast::Type * argType, const ast::Type * paramType, const ast::SymbolTable & symtab, 
-                const ast::TypeEnvironment & env 
-        ) {
-                PRINT(
-                        std::cerr << std::endl << "converting ";
-                        ast::print( std::cerr, argType, 2 );
-                        std::cerr << std::endl << " to ";
-                        ast::print( std::cerr, paramType, 2 );
-                        std::cerr << std::endl << "environment is: ";
-                        ast::print( std::cerr, env, 2 );
-                        std::cerr << std::endl;
-                )
-                Cost convCost = conversionCost( argType, paramType, symtab, env );
-                PRINT(
-                        std::cerr << std::endl << "cost is " << convCost << std::endl;
-                )
-                if ( convCost == Cost::infinity ) return convCost;
-                convCost.incPoly( polyCost( paramType, symtab, env ) + polyCost( argType, symtab, env ) );
-                PRINT(
-                        std::cerr << "cost with polycost is " << convCost << std::endl;
-                )
-                return convCost;
         }
 
@@ -1564 +1563 @@
                 CandidateList satisfied;
                 std::vector< std::string > errors;
-                for ( auto & candidate : candidates ) {
-                        satisfyAssertions( *candidate, symtab, satisfied, errors );
+                for ( CandidateRef & candidate : candidates ) {
+                        satisfyAssertions( candidate, symtab, satisfied, errors );
                 }