Changeset 59cf83b

Timestamp:

Oct 5, 2018, 10:30:21 AM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

6d6e829

Parents:

9ad2f9f

Message:

Switch resolution flags to packed struct

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (6 diffs)
• AlternativeFinder.h (modified) (3 diffs)
• ResolvMode.h (added)
• Resolver.cc (modified) (5 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:52:08 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 17 11:19:39 2018
-// Update Count     : 33
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Fri Oct -5 10:01:00 2018
+// Update Count     : 34
 //
 
@@ -244 +244 @@
         }
 
-        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;
@@ -253 +253 @@
                         SemanticError( expr, "No reasonable alternatives for expression " );
                 }
-                if ( prune ) {
+                if ( mode.prune ) {
                         auto oldsize = alternatives.size();
                         PRINT(
@@ -261 +261 @@
                         AltList pruned;
                         pruneAlternatives( alternatives.begin(), alternatives.end(), back_inserter( pruned ) );
-                        if ( failFast && pruned.empty() ) {
+                        if ( mode.failFast && pruned.empty() ) {
                                 std::ostringstream stream;
                                 AltList winners;
@@ -280 +280 @@
                 }
                 // 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->get_result(), i.env, indexer );
                         }
                 }
@@ -294 +294 @@
 
         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() );
         }
 

src/ResolvExpr/AlternativeFinder.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:56:12 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Jul 26 11:24:00 2017
-// Update Count     : 4
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Fri Oct -5 10:01:00 2018
+// Update Count     : 5
 //
 
@@ -24 +24 @@
 #include "ResolvExpr/Cost.h"             // for Cost, Cost::infinity
 #include "ResolvExpr/TypeEnvironment.h"  // for AssertionSet, OpenVarSet
+#include "ResolvMode.h"                  // for ResolvMode
 #include "SynTree/Visitor.h"             // for Visitor
 #include "SynTree/SynTree.h"             // for Visitor Nodes
@@ -68 +69 @@
                 }
 
-                void find( Expression *expr, bool adjust = false, bool prune = true, bool failFast = true );
+                void find( Expression *expr, ResolvMode mode = ResolvMode{} );
                 /// Calls find with the adjust flag set; adjustment turns array and function types into equivalent pointer types
                 void findWithAdjustment( Expression *expr );

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 17 11:19:40 2018
-// Update Count     : 213
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Fri Oct 05 09:43:00 2018
+// Update Count     : 214
 //
 
@@ -31 +31 @@
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
 #include "Resolver.h"
+#include "ResolvMode.h"                  // for ResolvMode
 #include "SymTab/Autogen.h"              // for SizeType
 #include "SymTab/Indexer.h"              // for Indexer
@@ -168 +169 @@
 
         namespace {
-                void findUnfinishedKindExpression(Expression * untyped, Alternative & alt, const SymTab::Indexer & indexer, const std::string & kindStr, std::function<bool(const Alternative &)> pred, bool adjust = false, bool prune = true, bool failFast = true) {
+                void findUnfinishedKindExpression(Expression * untyped, Alternative & alt, const SymTab::Indexer & indexer, const std::string & kindStr, std::function<bool(const Alternative &)> pred, ResolvMode mode = ResolvMode{} ) {
                         assertf( untyped, "expected a non-null expression." );
                         TypeEnvironment env;
                         AlternativeFinder finder( indexer, env );
-                        finder.find( untyped, adjust, prune, failFast );
+                        finder.find( untyped, mode );
 
                         #if 0
@@ -216 +217 @@
 
                 /// resolve `untyped` to the expression whose alternative satisfies `pred` with the lowest cost; kindStr is used for providing better error messages
-                void findKindExpression(Expression *& untyped, const SymTab::Indexer & indexer, const std::string & kindStr, std::function<bool(const Alternative &)> pred, bool adjust = false, bool prune = true, bool failFast = true) {
+                void findKindExpression(Expression *& untyped, const SymTab::Indexer & indexer, const std::string & kindStr, std::function<bool(const Alternative &)> pred, ResolvMode mode = ResolvMode{}) {
                         if ( ! untyped ) return;
                         Alternative choice;
-                        findUnfinishedKindExpression( untyped, choice, indexer, kindStr, pred, adjust, prune, failFast );
+                        findUnfinishedKindExpression( untyped, choice, indexer, kindStr, pred, mode );
                         finishExpr( choice.expr, choice.env, untyped->env );
                         delete untyped;
@@ -250 +251 @@
                 untyped.arg = expr;
                 Alternative choice;
-                findUnfinishedKindExpression( &untyped, choice, indexer, "", standardAlternativeFilter, true );
+                findUnfinishedKindExpression( &untyped, choice, indexer, "", standardAlternativeFilter, ResolvMode::withAdjustment() );
                 CastExpr * castExpr = strict_dynamic_cast< CastExpr * >( choice.expr );
                 env = std::move( choice.env );