Changes in src/ResolvExpr/CandidateFinder.cpp [7a780ad:fc1a3e2]

File:

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

src/ResolvExpr/CandidateFinder.cpp

@@ -513 +513 @@
                                         // add new result
                                         assert( common );
-                                        // auto attrType = common.as<ast::EnumAttrType>();
-                                        // if ( attrType && ( attrType->attr == ast::EnumAttribute::Value ) ) {
-                                        //      auto callExpr = new ast::UntypedExpr(
-                                        //              expr->location, new ast::NameExpr( expr->location, "valueE"), {expr} );
-                                        //      CandidateFinder finder( context, env );
-                                        //      finder.find( callExpr );
-                                        //      CandidateList winners = findMinCost( finder.candidates );
-                                        //      if (winners.size() != 1) {
-                                        //              SemanticError( callExpr, "Ambiguous expression in valueE" );
-                                        //      }
-                                        //      CandidateRef & choice = winners.front();
-                                        //      choice->expr = referenceToRvalueConversion( choice->expr, choice->cost );
-
-                                        //      results.emplace_back(
-                                        //              i, choice->expr, 
-                                        //              std::move( env ), std::move( need ), std::move( have ), std::move( open ),
-                                        //              nextArg + 1, nTuples, expl.cost, expl.exprs.size() == 1 ? 0 : 1, j );
-                                        // } else {
                                                 results.emplace_back(
                                                         i, expr, std::move( env ), std::move( need ), std::move( have ), std::move( open ),
@@ -921 +903 @@
                                 CandidateList winners = findMinCost( finder.candidates );
                                 if (winners.size() != 1) {
-                                        SemanticError( callExpr, "Ambiguous expression in valueE" );
+                                        SemanticError( callExpr, "Ambiguous expression in valueE..." );
                                 }
                                 CandidateRef & choice = winners.front();
-                                // choice->cost.incSafe();
+                                choice->cost.incVar();
                                 candidates.emplace_back( std::move(choice) );
                         }
@@ -1430 +1412 @@
         }
 
-    void Finder::postvisit(const ast::VariableExpr *variableExpr) {
-        // not sufficient to just pass `variableExpr` here, type might have changed
-
-        auto cand = new Candidate(variableExpr, tenv);
-        candidates.emplace_back(cand);
-    }
+        void Finder::postvisit(const ast::VariableExpr *variableExpr) {
+                // not sufficient to just pass `variableExpr` here, type might have changed
+
+                auto cand = new Candidate(variableExpr, tenv);
+                candidates.emplace_back(cand);
+        }
 
         void Finder::postvisit( const ast::ConstantExpr * constantExpr ) {
@@ -1800 +1782 @@
                                                         CandidateList winners = findMinCost( finder.candidates );
                                                         if (winners.size() != 1) {
-                                                                SemanticError( callExpr, "Ambiguous expression in valueE" );
+                                                                SemanticError( callExpr, "Ambiguous expression in valueE..." );
                                                         }
                                                         CandidateRef & choice = winners.front();
@@ -2150 +2132 @@
 }
 
-const ast::Expr * getValueEnumCall( const ast::Expr * expr,
-                const ResolveContext & context, const ast::TypeEnvironment & env ) {
-        auto callExpr = new ast::UntypedExpr(
-                expr->location, new ast::NameExpr( expr->location, "valueE"), {expr} );
-        CandidateFinder finder( context, env );
-        finder.find( callExpr );
-        CandidateList winners = findMinCost( finder.candidates );
-        if (winners.size() != 1) {
-                SemanticError( callExpr, "Ambiguous expression in valueE" );
-        }
-        CandidateRef & choice = winners.front();
-        return choice->expr;
+// get the valueE(...) ApplicationExpr that returns the enum value
+const ast::Expr * getValueEnumCall(
+        const ast::Expr * expr,
+        const ResolvExpr::ResolveContext & context, const ast::TypeEnvironment & env ) {
+                auto callExpr = new ast::UntypedExpr(
+                        expr->location, new ast::NameExpr( expr->location, "valueE"), {expr} );
+                CandidateFinder finder( context, env );
+                finder.find( callExpr );
+                CandidateList winners = findMinCost( finder.candidates );
+                if (winners.size() != 1) {
+                        SemanticError( callExpr, "Ambiguous expression in valueE..." );
+                }
+                CandidateRef & choice = winners.front();
+                return choice->expr;
 }