Changeset d57e349 for src/ResolvExpr/Resolver.cc

Timestamp:

Jun 11, 2019, 1:36:00 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

3da7c19

Parents:

396037d

Message:

More resolver porting

File:

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

src/ResolvExpr/Resolver.cc

@@ -957 +957 @@
                         }
                 };
-
-                /// 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;
-                }
-
+        } // 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 {
                 /// always-accept candidate filter
                 bool anyCandidate( const Candidate & ) { return true; }
@@ -1024 +1026 @@
 
                         // promote candidate.cvtCost to .cost
-                        for ( CandidateRef & cand : winners ) {
-                                cand->cost = cand->cvtCost;
-                        }
+                        promoteCvtCost( winners );
 
                         // produce ambiguous errors, if applicable