Changes in src/ResolvExpr/AlternativeFinder.cc [3233b91:3b0c8cb]

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -131 +131 @@
 
         void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt ) {
-                std::vector<std::string> sorted;
-                sorted.reserve(list.size());
-                for(const auto & c : list) {
-                        std::stringstream ss;
-                        c.print( ss, indentAmt );
-                        sorted.push_back(ss.str());
-                }
-
-                std::sort(sorted.begin(), sorted.end());
-
-                for ( const auto & s : sorted ) {
-                        os << s << std::endl;
+                Indenter indent = { indentAmt };
+                for ( AltList::const_iterator i = list.begin(); i != list.end(); ++i ) {
+                        i->print( os, indent );
+                        os << std::endl;
                 }
         }
@@ -259 +251 @@
                         SemanticError( expr, "No reasonable alternatives for expression " );
                 }
-                if ( mode.prune ) {
+                if ( mode.satisfyAssns || mode.prune ) {
                         // trim candidates just to those where the assertions resolve
                         // - necessary pre-requisite to pruning
@@ -1224 +1216 @@
                         unify( castExpr->result, alt.expr->result, alt.env, needAssertions,
                                 haveAssertions, openVars, indexer );
-                        Cost thisCost =
-                                castExpr->isGenerated
-                                ? conversionCost( alt.expr->result, castExpr->result, alt.expr->get_lvalue(),   indexer, alt.env )
-                                : castCost( alt.expr->result, castExpr->result, alt.expr->get_lvalue(), indexer, alt.env );
+                        Cost thisCost = castCost( alt.expr->result, castExpr->result, alt.expr->get_lvalue(),
+                                indexer, alt.env );
                         PRINT(
                                 std::cerr << "working on cast with result: " << castExpr->result << std::endl;
@@ -1302 +1292 @@
 
                 try {
-                        // Attempt 1 : turn (thread&)X into ($thread&)X.__thrd
+                        // Attempt 1 : turn (thread&)X into (thread_desc&)X.__thrd
                         // Clone is purely for memory management
                         std::unique_ptr<Expression> tech1 { new UntypedMemberExpr(new NameExpr(castExpr->concrete_target.field), castExpr->arg->clone()) };
@@ -1313 +1303 @@
                 } catch(SemanticErrorException & ) {}
 
-                // Fallback : turn (thread&)X into ($thread&)get_thread(X)
+                // Fallback : turn (thread&)X into (thread_desc&)get_thread(X)
                 std::unique_ptr<Expression> fallback { UntypedExpr::createDeref( new UntypedExpr(new NameExpr(castExpr->concrete_target.getter), { castExpr->arg->clone() })) };
                 // don't prune here, since it's guaranteed all alternatives will have the same type
@@ -1708 +1698 @@
 
                                 // unification run for side-effects
-                                bool canUnify = unify( toType, alt.expr->result, newEnv, need, have, openVars, indexer );
-                                (void) canUnify;
+                                unify( toType, alt.expr->result, newEnv, need, have, openVars, indexer );
                                 // xxx - do some inspecting on this line... why isn't result bound to initAlt.type?
 
-                                Cost thisCost = computeConversionCost( alt.expr->result, toType, alt.expr->get_lvalue(),
+                                Cost thisCost = castCost( alt.expr->result, toType, alt.expr->get_lvalue(),
                                         indexer, newEnv );
-
-                                PRINT(
-                                        Cost legacyCost = castCost( alt.expr->result, toType, alt.expr->get_lvalue(),
-                                                indexer, newEnv );
-                                        std::cerr << "Considering initialization:";
-                                        std::cerr << std::endl << "  FROM: "; alt.expr->result->print(std::cerr);
-                                        std::cerr << std::endl << "  TO: ";   toType          ->print(std::cerr);
-                                        std::cerr << std::endl << "  Unification " << (canUnify ? "succeeded" : "failed");
-                                        std::cerr << std::endl << "  Legacy cost " << legacyCost;
-                                        std::cerr << std::endl << "  New cost " << thisCost;
-                                        std::cerr << std::endl;
-                                )
-
                                 if ( thisCost != Cost::infinity ) {
                                         // count one safe conversion for each value that is thrown away