Changes in src/ResolvExpr/AlternativeFinder.cc [b6d6e97:33a25f9]

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -144 +144 @@
                         expr->get_result()->accept( global_renamer );
                 }
+
+                void referenceToRvalueConversion( Expression *& expr ) {
+                        if ( dynamic_cast< ReferenceType * >( expr->get_result() ) ) {
+                                // cast away reference from expr
+                                expr = new CastExpr( expr, expr->get_result()->stripReferences()->clone() );
+                        }
+                }
         } // namespace
-
-        void referenceToRvalueConversion( Expression *& expr ) {
-                if ( dynamic_cast< ReferenceType * >( expr->get_result() ) ) {
-                        // cast away reference from expr
-                        expr = new CastExpr( expr, expr->get_result()->stripReferences()->clone() );
-                }
-        }
 
         template< typename InputIterator, typename OutputIterator >
@@ -174 +174 @@
         }
 
-        void AlternativeFinder::find( Expression *expr, bool adjust, bool prune, bool failFast ) {
+        void AlternativeFinder::find( Expression *expr, bool adjust, bool prune ) {
                 expr->accept( *this );
-                if ( failFast && alternatives.empty() ) {
+                if ( alternatives.empty() ) {
                         throw SemanticError( "No reasonable alternatives for expression ", expr );
                 }
@@ -191 +191 @@
                         AltList::iterator oldBegin = alternatives.begin();
                         pruneAlternatives( alternatives.begin(), alternatives.end(), front_inserter( alternatives ) );
-                        if ( failFast && alternatives.begin() == oldBegin ) {
+                        if ( alternatives.begin() == oldBegin ) {
                                 std::ostringstream stream;
                                 AltList winners;
@@ -214 +214 @@
         }
 
-        void AlternativeFinder::findWithAdjustment( Expression *expr ) {
-                find( expr, true );
-        }
-
-        void AlternativeFinder::findWithoutPrune( Expression * expr ) {
-                find( expr, true, false );
-        }
-
-        void AlternativeFinder::maybeFind( Expression * expr ) {
-                find( expr, true, true, false );
+        void AlternativeFinder::findWithAdjustment( Expression *expr, bool prune ) {
+                find( expr, true, prune );
         }
 
@@ -722 +714 @@
 
                 // find function operators
-                static NameExpr *opExpr = new NameExpr( "?()" );
                 AlternativeFinder funcOpFinder( indexer, env );
-                // it's ok if there aren't any defined function ops
-                funcOpFinder.maybeFind( opExpr);
+                NameExpr *opExpr = new NameExpr( "?()" );
+                try {
+                        funcOpFinder.findWithAdjustment( opExpr );
+                } catch( SemanticError &e ) {
+                        // it's ok if there aren't any defined function ops
+                }
                 PRINT(
                         std::cerr << "known function ops:" << std::endl;
@@ -933 +928 @@
                 AlternativeFinder finder( indexer, env );
                 // don't prune here, since it's guaranteed all alternatives will have the same type
-                finder.findWithoutPrune( castExpr->get_arg() );
+                // (giving the alternatives different types is half of the point of ConstructorExpr nodes)
+                finder.findWithAdjustment( castExpr->get_arg(), false );
                 for ( Alternative & alt : finder.alternatives ) {
                         alternatives.push_back( Alternative(
@@ -1230 +1226 @@
                 // don't prune here, since it's guaranteed all alternatives will have the same type
                 // (giving the alternatives different types is half of the point of ConstructorExpr nodes)
-                finder.findWithoutPrune( ctorExpr->get_callExpr() );
+                finder.findWithAdjustment( ctorExpr->get_callExpr(), false );
                 for ( Alternative & alt : finder.alternatives ) {
                         alternatives.push_back( Alternative( new ConstructorExpr( alt.expr->clone() ), alt.env, alt.cost ) );