Changes in src/ResolvExpr/CandidateFinder.cpp [39d8950:7f62b708]

File:

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

src/ResolvExpr/CandidateFinder.cpp

@@ -10 +10 @@
 // Created On       : Wed Jun 5 14:30:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Mar 16 11:58:00 2022
-// Update Count     : 3
+// Last Modified On : Tue Oct  1 14:55:00 2019
+// Update Count     : 2
 //
 
@@ -595 +595 @@
         /// Actually visits expressions to find their candidate interpretations
         class Finder final : public ast::WithShortCircuiting {
-                const ResolveContext & context;
                 const ast::SymbolTable & symtab;
         public:
@@ -619 +618 @@
 
                 Finder( CandidateFinder & f )
-                : context( f.context ), symtab( context.symtab ), selfFinder( f ),
-                  candidates( f.candidates ), tenv( f.env ), targetType( f.targetType ) {}
+                : symtab( f.localSyms ), selfFinder( f ), candidates( f.candidates ), tenv( f.env ),
+                  targetType( f.targetType ) {}
 
                 void previsit( const ast::Node * ) { visit_children = false; }
@@ -873 +872 @@
                         Tuples::handleTupleAssignment( selfFinder, untypedExpr, argCandidates );
 
-                        CandidateFinder funcFinder( context, tenv );
+                        CandidateFinder funcFinder{ symtab, tenv };
                         if (auto nameExpr = untypedExpr->func.as<ast::NameExpr>()) {
                                 auto kind = ast::SymbolTable::getSpecialFunctionKind(nameExpr->name);
@@ -919 +918 @@
                         // find function operators
                         ast::ptr< ast::Expr > opExpr = new ast::NameExpr{ untypedExpr->location, "?()" };
-                        CandidateFinder opFinder( context, tenv );
+                        CandidateFinder opFinder{ symtab, tenv };
                         // okay if there aren't any function operations
                         opFinder.find( opExpr, ResolvMode::withoutFailFast() );
@@ -1060 +1059 @@
 
                 void postvisit( const ast::AddressExpr * addressExpr ) {
-                        CandidateFinder finder( context, tenv );
+                        CandidateFinder finder{ symtab, tenv };
                         finder.find( addressExpr->arg );
 
@@ -1080 +1079 @@
                         ast::ptr< ast::Type > toType = castExpr->result;
                         assert( toType );
-                        toType = resolveTypeof( toType, context );
+                        toType = resolveTypeof( toType, symtab );
                         // toType = SymTab::validateType( castExpr->location, toType, symtab );
                         toType = adjustExprType( toType, tenv, symtab );
 
-                        CandidateFinder finder( context, tenv, toType );
+                        CandidateFinder finder{ symtab, tenv, toType };
                         finder.find( castExpr->arg, ResolvMode::withAdjustment() );
 
@@ -1137 +1136 @@
                 void postvisit( const ast::VirtualCastExpr * castExpr ) {
                         assertf( castExpr->result, "Implicit virtual cast targets not yet supported." );
-                        CandidateFinder finder( context, tenv );
+                        CandidateFinder finder{ symtab, tenv };
                         // don't prune here, all alternatives guaranteed to have same type
                         finder.find( castExpr->arg, ResolvMode::withoutPrune() );
@@ -1154 +1153 @@
                         auto target = inst->base.get();
 
-                        CandidateFinder finder( context, tenv );
+                        CandidateFinder finder{ symtab, tenv };
 
                         auto pick_alternatives = [target, this](CandidateList & found, bool expect_ref) {
@@ -1203 +1202 @@
 
                 void postvisit( const ast::UntypedMemberExpr * memberExpr ) {
-                        CandidateFinder aggFinder( context, tenv );
+                        CandidateFinder aggFinder{ symtab, tenv };
                         aggFinder.find( memberExpr->aggregate, ResolvMode::withAdjustment() );
                         for ( CandidateRef & agg : aggFinder.candidates ) {
@@ -1288 +1287 @@
                                 addCandidate(
                                         new ast::SizeofExpr{
-                                                sizeofExpr->location, resolveTypeof( sizeofExpr->type, context ) },
+                                                sizeofExpr->location, resolveTypeof( sizeofExpr->type, symtab ) },
                                         tenv );
                         } else {
                                 // find all candidates for the argument to sizeof
-                                CandidateFinder finder( context, tenv );
+                                CandidateFinder finder{ symtab, tenv };
                                 finder.find( sizeofExpr->expr );
                                 // find the lowest-cost candidate, otherwise ambiguous
@@ -1312 +1311 @@
                                 addCandidate(
                                         new ast::AlignofExpr{
-                                                alignofExpr->location, resolveTypeof( alignofExpr->type, context ) },
+                                                alignofExpr->location, resolveTypeof( alignofExpr->type, symtab ) },
                                         tenv );
                         } else {
                                 // find all candidates for the argument to alignof
-                                CandidateFinder finder( context, tenv );
+                                CandidateFinder finder{ symtab, tenv };
                                 finder.find( alignofExpr->expr );
                                 // find the lowest-cost candidate, otherwise ambiguous
@@ -1355 +1354 @@
 
                 void postvisit( const ast::LogicalExpr * logicalExpr ) {
-                        CandidateFinder finder1( context, tenv );
+                        CandidateFinder finder1{ symtab, tenv };
                         finder1.find( logicalExpr->arg1, ResolvMode::withAdjustment() );
                         if ( finder1.candidates.empty() ) return;
 
-                        CandidateFinder finder2( context, tenv );
+                        CandidateFinder finder2{ symtab, tenv };
                         finder2.find( logicalExpr->arg2, ResolvMode::withAdjustment() );
                         if ( finder2.candidates.empty() ) return;
@@ -1385 +1384 @@
                 void postvisit( const ast::ConditionalExpr * conditionalExpr ) {
                         // candidates for condition
-                        CandidateFinder finder1( context, tenv );
+                        CandidateFinder finder1{ symtab, tenv };
                         finder1.find( conditionalExpr->arg1, ResolvMode::withAdjustment() );
                         if ( finder1.candidates.empty() ) return;
 
                         // candidates for true result
-                        CandidateFinder finder2( context, tenv );
+                        CandidateFinder finder2{ symtab, tenv };
                         finder2.find( conditionalExpr->arg2, ResolvMode::withAdjustment() );
                         if ( finder2.candidates.empty() ) return;
 
                         // candidates for false result
-                        CandidateFinder finder3( context, tenv );
+                        CandidateFinder finder3{ symtab, tenv };
                         finder3.find( conditionalExpr->arg3, ResolvMode::withAdjustment() );
                         if ( finder3.candidates.empty() ) return;
@@ -1446 +1445 @@
                 void postvisit( const ast::CommaExpr * commaExpr ) {
                         ast::TypeEnvironment env{ tenv };
-                        ast::ptr< ast::Expr > arg1 = resolveInVoidContext( commaExpr->arg1, context, env );
-
-                        CandidateFinder finder2( context, env );
+                        ast::ptr< ast::Expr > arg1 = resolveInVoidContext( commaExpr->arg1, symtab, env );
+
+                        CandidateFinder finder2{ symtab, env };
                         finder2.find( commaExpr->arg2, ResolvMode::withAdjustment() );
 
@@ -1461 +1460 @@
 
                 void postvisit( const ast::ConstructorExpr * ctorExpr ) {
-                        CandidateFinder finder( context, tenv );
+                        CandidateFinder finder{ symtab, tenv };
                         finder.find( ctorExpr->callExpr, ResolvMode::withoutPrune() );
                         for ( CandidateRef & r : finder.candidates ) {
@@ -1470 +1469 @@
                 void postvisit( const ast::RangeExpr * rangeExpr ) {
                         // resolve low and high, accept candidates where low and high types unify
-                        CandidateFinder finder1( context, tenv );
+                        CandidateFinder finder1{ symtab, tenv };
                         finder1.find( rangeExpr->low, ResolvMode::withAdjustment() );
                         if ( finder1.candidates.empty() ) return;
 
-                        CandidateFinder finder2( context, tenv );
+                        CandidateFinder finder2{ symtab, tenv };
                         finder2.find( rangeExpr->high, ResolvMode::withAdjustment() );
                         if ( finder2.candidates.empty() ) return;
@@ -1550 +1549 @@
 
                 void postvisit( const ast::UniqueExpr * unqExpr ) {
-                        CandidateFinder finder( context, tenv );
+                        CandidateFinder finder{ symtab, tenv };
                         finder.find( unqExpr->expr, ResolvMode::withAdjustment() );
                         for ( CandidateRef & r : finder.candidates ) {
@@ -1559 +1558 @@
 
                 void postvisit( const ast::StmtExpr * stmtExpr ) {
-                        addCandidate( resolveStmtExpr( stmtExpr, context ), tenv );
+                        addCandidate( resolveStmtExpr( stmtExpr, symtab ), tenv );
                 }
 
@@ -1571 +1570 @@
                         for ( const ast::InitAlternative & initAlt : initExpr->initAlts ) {
                                 // calculate target type
-                                const ast::Type * toType = resolveTypeof( initAlt.type, context );
+                                const ast::Type * toType = resolveTypeof( initAlt.type, symtab );
                                 // toType = SymTab::validateType( initExpr->location, toType, symtab );
                                 toType = adjustExprType( toType, tenv, symtab );
@@ -1577 +1576 @@
                                 // types are not bound to the initialization type, since return type variables are
                                 // only open for the duration of resolving the UntypedExpr.
-                                CandidateFinder finder( context, tenv, toType );
+                                CandidateFinder finder{ symtab, tenv, toType };
                                 finder.find( initExpr->expr, ResolvMode::withAdjustment() );
                                 for ( CandidateRef & cand : finder.candidates ) {
@@ -1694 +1693 @@
                 }
                 else {
-                        satisfyAssertions(candidate, context.symtab, satisfied, errors);
+                        satisfyAssertions(candidate, localSyms, satisfied, errors);
                         needRecomputeKey = true;
                 }
@@ -1856 +1855 @@
                         r->expr = ast::mutate_field(
                                 r->expr.get(), &ast::Expr::result,
-                                adjustExprType( r->expr->result, r->env, context.symtab ) );
+                                adjustExprType( r->expr->result, r->env, localSyms ) );
                 }
         }
@@ -1874 +1873 @@
 
         for ( const auto & x : xs ) {
-                out.emplace_back( context, env );
+                out.emplace_back( localSyms, env );
                 out.back().find( x, ResolvMode::withAdjustment() );