Changeset bd78797 for src/ResolvExpr

Timestamp:

Jan 17, 2019, 1:34:42 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

da6032af, ec7f50a

Parents:

c9aba81

Message:

closes #118

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -474 +474 @@
                 }
 
-                // mark specialization cost of return types
-                for ( DeclarationWithType* returnVal : function->returnVals ) {
-                        convCost.decSpec( specCost( returnVal->get_type() ) );
-                }
+                // 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 type variable and specialization cost of forall clause
@@ -1229 +1232 @@
                                 Alternative newAlt{ 
                                         restructureCast( alt.expr->clone(), toType, castExpr->isGenerated ), 
-                                        alt.env, openVars, needAssertions, alt.cost + thisCost, thisCost };
+                                        alt.env, openVars, needAssertions, alt.cost, alt.cost + thisCost };
                                 inferParameters( newAlt, back_inserter( candidates ) );
                         } // if