Changes in src/ResolvExpr/Resolver.cc [4b7cce6:2773ab8]

File:

• src/ResolvExpr/Resolver.cc (modified) (3 diffs)

src/ResolvExpr/Resolver.cc

@@ -957 +957 @@
                         }
                 };
-        } // anonymous namespace
-
-        /// Check if this expression is or includes a deleted expression
-        const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr ) {
-                ast::Pass<DeleteFinder_new> finder;
-                expr->accept( finder );
-                return finder.pass.delExpr;
-        }
-
-        namespace {
+
+                /// Check if this expression is or includes a deleted expression
+                const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr ) {
+                        ast::Pass<DeleteFinder_new> finder;
+                        expr->accept( finder );
+                        return finder.pass.delExpr;
+                }
+
                 /// always-accept candidate filter
                 bool anyCandidate( const Candidate & ) { return true; }
@@ -1026 +1024 @@
 
                         // promote candidate.cvtCost to .cost
-                        promoteCvtCost( winners );
+                        for ( CandidateRef & cand : winners ) {
+                                cand->cost = cand->cvtCost;
+                        }
 
                         // produce ambiguous errors, if applicable
@@ -1100 +1100 @@
                         StripCasts_new::strip( expr );
                 }
-        } // anonymous namespace
-
-                
-        ast::ptr< ast::Expr > resolveInVoidContext(
-                const ast::Expr * expr, const ast::SymbolTable & symtab, ast::TypeEnvironment & env
-        ) {
-                assertf( expr, "expected a non-null expression" );
-                
-                // set up and resolve expression cast to void
-                ast::CastExpr * untyped = new ast::CastExpr{ expr->location, expr };
-                CandidateRef choice = findUnfinishedKindExpression( 
-                        untyped, symtab, "", anyCandidate, ResolvMode::withAdjustment() );
-                
-                // a cast expression has either 0 or 1 interpretations (by language rules);
-                // if 0, an exception has already been thrown, and this code will not run
-                const ast::CastExpr * castExpr = choice->expr.strict_as< ast::CastExpr >();
-                env = std::move( choice->env );
-
-                return castExpr->arg;
-        }
-
-        namespace {
+
+                /// Find the expression candidate that is the unique best match for `untyped` in a `void`
+                /// context.
+                ast::ptr< ast::Expr > resolveInVoidContext(
+                        const ast::Expr * expr, const ast::SymbolTable & symtab, ast::TypeEnvironment & env
+                ) {
+                        assertf( expr, "expected a non-null expression" );
+                        
+                        // set up and resolve expression cast to void
+                        ast::CastExpr * untyped = new ast::CastExpr{ expr->location, expr };
+                        CandidateRef choice = findUnfinishedKindExpression( 
+                                untyped, symtab, "", anyCandidate, ResolvMode::withAdjustment() );
+                        
+                        // a cast expression has either 0 or 1 interpretations (by language rules);
+                        // if 0, an exception has already been thrown, and this code will not run
+                        const ast::CastExpr * castExpr = choice->expr.strict_as< ast::CastExpr >();
+                        env = std::move( choice->env );
+
+                        return castExpr->arg;
+                }
+
                 /// Resolve `untyped` to the expression whose candidate is the best match for a `void` 
                 /// context.