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

File:

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

src/ResolvExpr/CandidateFinder.cpp

@@ -906 +906 @@
                                 }
                                 CandidateRef & choice = winners.front();
-                                choice->cost.incSafe();
+                                choice->cost.incVar();
                                 candidates.emplace_back( std::move(choice) );
                         }
@@ -1376 +1376 @@
                         ast::Expr * newExpr = data.combine( nameExpr->location, cost );
 
-                        // bool bentConversion = false;
-                        // if ( auto inst = newExpr->result.as<ast::EnumInstType>() ) {
-                        //      if ( inst->base && inst->base->base ) {
-                        //              bentConversion = true;
-                        //      }
-                        // }
-
-                        // CandidateRef newCand = std::make_shared<Candidate>(
-                        //      newExpr, copy( tenv ), ast::OpenVarSet{}, ast::AssertionSet{}, bentConversion? Cost::safe: Cost::zero,
-                        //      cost );
+                        bool bentConversion = false;
+                        if ( auto inst = newExpr->result.as<ast::EnumInstType>() ) {
+                                if ( inst->base && inst->base->base ) {
+                                        bentConversion = true;
+                                }
+                        }
+
                         CandidateRef newCand = std::make_shared<Candidate>(
-                                newExpr, copy( tenv ), ast::OpenVarSet{}, ast::AssertionSet{}, Cost::zero,
+                                newExpr, copy( tenv ), ast::OpenVarSet{}, ast::AssertionSet{}, bentConversion? Cost::safe: Cost::zero,
                                 cost );
+
                         if (newCand->expr->env) {
                                 newCand->env.add(*newCand->expr->env);
@@ -1831 +1829 @@
                                         Cost cost = Cost::zero;
                                         ast::Expr * newExpr = data.combine( expr->location, cost );
-                                        // CandidateRef newCand =
-                                        //      std::make_shared<Candidate>(
-                                        //              newExpr, copy( tenv ), ast::OpenVarSet{},
-                                        //              ast::AssertionSet{}, Cost::safe, cost
-                                        //      );
                                         CandidateRef newCand =
                                                 std::make_shared<Candidate>(
                                                         newExpr, copy( tenv ), ast::OpenVarSet{},
-                                                        ast::AssertionSet{}, Cost::zero, cost
+                                                        ast::AssertionSet{}, Cost::safe, cost
                                                 );
+
                                         if (newCand->expr->env) {
                                                 newCand->env.add(*newCand->expr->env);