Changeset 4e7f0f1 for src/ResolvExpr

Timestamp:

Sep 7, 2016, 11:40:52 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

3b58d91

Parents:

e76acbe (diff), 02cea2d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into tuples

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -366 +366 @@
                                 std::cerr << std::endl << " to ";
                                 assert->second.formalType->print( std::cerr, 8 );
-                                )
-                                Cost newCost = conversionCost( assert->second.actualType, assert->second.formalType, indexer, alt.env );
+                        )
+                        Cost newCost = conversionCost( assert->second.actualType, assert->second.formalType, indexer, alt.env );
                         PRINT(
                                 std::cerr << std::endl << "cost of conversion is " << newCost << std::endl;
-                                )
-                                if ( newCost == Cost::infinity ) {
-                                        return newCost;
-                                }
+                        )
+                        if ( newCost == Cost::infinity ) {
+                                return newCost;
+                        }
                         convCost += newCost;