Changes in src/ResolvExpr/CandidateFinder.cpp [18e683b:417117e]

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (8 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -370 +370 @@
                                                         // push empty tuple expression
                                                         newResult.parent = i;
-                                                        std::vector< ast::ptr< ast::Expr > > emptyList;
-                                                        newResult.expr = 
-                                                                new ast::TupleExpr{ CodeLocation{}, move( emptyList ) };
+                                                        newResult.expr = new ast::TupleExpr{ CodeLocation{}, {} };
                                                         argType = newResult.expr->result;
                                                 } else {
@@ -548 +546 @@
                 genStart = genEnd;
 
-                return genEnd != results.size();
+                return genEnd != results.size();  // were any new results added?
         }
 
@@ -594 +592 @@
 
         /// Actually visits expressions to find their candidate interpretations
-        struct Finder final : public ast::WithShortCircuiting {
+        class Finder final : public ast::WithShortCircuiting {
+                const ast::SymbolTable & symtab;
+        public:
                 CandidateFinder & selfFinder;
-                const ast::SymbolTable & symtab;
                 CandidateList & candidates;
                 const ast::TypeEnvironment & tenv;
@@ -602 +601 @@
 
                 Finder( CandidateFinder & f )
-                : selfFinder( f ), symtab( f.symtab ), candidates( f.candidates ), tenv( f.env ), 
+                : symtab( f.localSyms ), selfFinder( f ), candidates( f.candidates ), tenv( f.env ), 
                   targetType( f.targetType ) {}
                 
@@ -676 +675 @@
                         ast::TypeEnvironment funcEnv{ func->env };
                         makeUnifiableVars( funcType, funcOpen, funcNeed );
-                        // add all type variables as open variables now so that those not used in the parameter 
-                        // list are still considered open
+                        // add all type variables as open variables now so that those not used in the 
+                        // parameter list are still considered open
                         funcEnv.add( funcType->forall );
 
@@ -1558 +1557 @@
                 std::vector< std::string > errors;
                 for ( CandidateRef & candidate : candidates ) {
-                        satisfyAssertions( candidate, symtab, satisfied, errors );
+                        satisfyAssertions( candidate, localSyms, satisfied, errors );
                 }
 
@@ -1613 +1612 @@
                         r->expr = ast::mutate_field( 
                                 r->expr.get(), &ast::Expr::result, 
-                                adjustExprType( r->expr->result, r->env, symtab ) );
+                                adjustExprType( r->expr->result, r->env, localSyms ) );
                 }
         }
@@ -1631 +1630 @@
 
         for ( const auto & x : xs ) {
-                out.emplace_back( symtab, env );
+                out.emplace_back( localSyms, env );
                 out.back().find( x, ResolvMode::withAdjustment() );