Changes in src/ResolvExpr/CandidateFinder.cpp [14755e5:a55ebcc]

File:

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

src/ResolvExpr/CandidateFinder.cpp

@@ -891 +891 @@
                 } else if ( auto unionInst = aggrExpr->result.as< ast::UnionInstType >() ) {
                         addAggMembers( unionInst, aggrExpr, *cand, Cost::unsafe, "" );
-                } else if ( auto enumInst = aggrExpr->result.as< ast::EnumInstType >() ) {
+                } 
+                else if ( auto enumInst = aggrExpr->result.as< ast::EnumInstType >() ) {
                         // The Attribute Arrays are not yet generated, need to proxy them
                         // as attribute function call
@@ -897 +898 @@
                         if ( enumInst->base && enumInst->base->base ) {
                                 auto valueName = new ast::NameExpr(location, "valueE");
-                                auto untypedValueCall = new ast::UntypedExpr(
+                                auto untypedValueCall = new ast::UntypedExpr( 
                                         location, valueName, { aggrExpr } );
                                 auto result = ResolvExpr::findVoidExpression( untypedValueCall, context );
@@ -974 +975 @@
                                         }
 
-                                        if (argType.as<ast::PointerType>()) funcFinder.otypeKeys.insert(Mangle::Encoding::pointer);
+                                        if (argType.as<ast::PointerType>()) funcFinder.otypeKeys.insert(Mangle::Encoding::pointer);                                             
                                         else funcFinder.otypeKeys.insert(Mangle::mangle(argType, Mangle::NoGenericParams | Mangle::Type));
                                 }
@@ -1239 +1240 @@
                                                 restructureCast( cand->expr, toType, castExpr->isGenerated ),
                                                 copy( cand->env ), std::move( open ), std::move( need ), cand->cost + thisCost);
-                                        // currently assertions are always resolved immediately so this should have no effect.
+                                        // currently assertions are always resolved immediately so this should have no effect. 
                                         // if this somehow changes in the future (e.g. delayed by indeterminate return type)
                                         // we may need to revisit the logic.
@@ -1402 +1403 @@
         void Finder::postvisit( const ast::VariableExpr * variableExpr ) {
                 // not sufficient to just pass `variableExpr` here, type might have changed since
-                addCandidate( variableExpr, tenv );
+                addCandidate( variableExpr, tenv );             
         }
 
@@ -1791 +1792 @@
                                         CandidateRef newCand =
                                                 std::make_shared<Candidate>(
-                                                        newExpr, copy( tenv ), ast::OpenVarSet{},
+                                                        newExpr, copy( tenv ), ast::OpenVarSet{}, 
                                                         ast::AssertionSet{}, Cost::zero, cost
                                                 );
-
+                                        
                                         if (newCand->expr->env) {
                                                 newCand->env.add(*newCand->expr->env);