Changes in src/ResolvExpr/AlternativeFinder.cc [da6032af:d97c3a4]

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -474 +474 @@
                 }
 
-                // specialization cost of return types can't be accounted for directly, it disables 
-                // otherwise-identical calls, like this example based on auto-newline in the I/O lib:
-                //
-                //   forall(otype OS) {
-                //     void ?|?(OS&, int);  // with newline
-                //     OS&  ?|?(OS&, int);  // no newline, always chosen due to more specialization
-                //   }
+                // mark specialization cost of return types
+                for ( DeclarationWithType* returnVal : function->returnVals ) {
+                        convCost.decSpec( specCost( returnVal->get_type() ) );
+                }
 
                 // mark type variable and specialization cost of forall clause
@@ -486 +483 @@
                 for ( TypeDecl* td : function->forall ) {
                         convCost.decSpec( td->assertions.size() );
+                }
+
+                // xxx -- replace with new costs in resolver
+                for ( InferredParams::const_iterator assert = appExpr->inferParams.begin(); assert != appExpr->inferParams.end(); ++assert ) {
+                        convCost += computeConversionCost( assert->second.actualType, assert->second.formalType, indexer, alt.env );
                 }
 
@@ -1227 +1229 @@
                                 Alternative newAlt{ 
                                         restructureCast( alt.expr->clone(), toType, castExpr->isGenerated ), 
-                                        alt.env, openVars, needAssertions, alt.cost, alt.cost + thisCost };
+                                        alt.env, openVars, needAssertions, alt.cost + thisCost, thisCost };
                                 inferParameters( newAlt, back_inserter( candidates ) );
                         } // if