Changeset 1d7b0a8 for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Jun 11, 2018, 2:50:06 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env

Children:

6d53e779, 982f95d

Parents:

8e18b8e

Message:

Move AlternativeFinder? find flags to ResolvMode? struct

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -233 +233 @@
         }
 
-        void AlternativeFinder::find( Expression *expr, bool adjust, bool prune, bool failFast ) {
+        void AlternativeFinder::find( Expression *expr, ResolvMode mode ) {
                 PassVisitor<Finder> finder( *this );
                 expr->accept( finder );
-                if ( failFast && alternatives.empty() ) {
+                if ( mode.failFast && alternatives.empty() ) {
                         PRINT(
                                 std::cerr << "No reasonable alternatives for expression " << expr << std::endl;
@@ -242 +242 @@
                         SemanticError( expr, "No reasonable alternatives for expression " );
                 }
-                if ( prune ) {
+                if ( mode.prune ) {
                         auto oldsize = alternatives.size();
                         PRINT(
@@ -250 +250 @@
                         AltList pruned;
                         pruneAlternatives( alternatives.begin(), alternatives.end(), back_inserter( pruned ) );
-                        if ( failFast && pruned.empty() ) {
+                        if ( mode.failFast && pruned.empty() ) {
                                 std::ostringstream stream;
                                 AltList winners;
@@ -269 +269 @@
                 }
                 // adjust types after pruning so that types substituted by pruneAlternatives are correctly adjusted
-                for ( AltList::iterator i = alternatives.begin(); i != alternatives.end(); ++i ) {
-                        if ( adjust ) {
-                                adjustExprType( i->expr->get_result(), i->env, indexer );
+                if ( mode.adjust ) {
+                        for ( Alternative& i : alternatives ) {
+                                adjustExprType( i.expr->result, i.env, indexer );
                         }
                 }
@@ -283 +283 @@
 
         void AlternativeFinder::findWithAdjustment( Expression *expr ) {
-                find( expr, true );
+                find( expr, ResolvMode::withAdjustment() );
         }
 
         void AlternativeFinder::findWithoutPrune( Expression * expr ) {
-                find( expr, true, false );
+                find( expr, ResolvMode::withoutPrune() );
         }
 
         void AlternativeFinder::maybeFind( Expression * expr ) {
-                find( expr, true, true, false );
+                find( expr, ResolvMode::withoutFailFast() );
         }