Changes in src/ResolvExpr/CandidateFinder.cpp [ab780e6:0522ebe]

File:

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

src/ResolvExpr/CandidateFinder.cpp

@@ -46 +46 @@
 #include "AST/Type.hpp"
 #include "Common/utility.h"       // for move, copy
+#include "Parser/parserutility.h" // for notZeroExpr
 #include "SymTab/Mangler.h"
 #include "Tuples/Tuples.h"        // for handleTupleAssignment
@@ -1017 +1018 @@
                                         }
 
-                                        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));
                                 }
@@ -1282 +1283 @@
                                                 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.
@@ -1586 +1587 @@
         void Finder::postvisit( const ast::LogicalExpr * logicalExpr ) {
                 CandidateFinder finder1( context, tenv );
-                ast::ptr<ast::Expr> arg1 = createCondExpr( logicalExpr->arg1 );
+                ast::ptr<ast::Expr> arg1 = notZeroExpr( logicalExpr->arg1 );
                 finder1.find( arg1, ResolveMode::withAdjustment() );
                 if ( finder1.candidates.empty() ) return;
 
                 CandidateFinder finder2( context, tenv );
-                ast::ptr<ast::Expr> arg2 = createCondExpr( logicalExpr->arg2 );
+                ast::ptr<ast::Expr> arg2 = notZeroExpr( logicalExpr->arg2 );
                 finder2.find( arg2, ResolveMode::withAdjustment() );
                 if ( finder2.candidates.empty() ) return;
@@ -1617 +1618 @@
         void Finder::postvisit( const ast::ConditionalExpr * conditionalExpr ) {
                 // candidates for condition
-                ast::ptr<ast::Expr> arg1 = createCondExpr( conditionalExpr->arg1 );
                 CandidateFinder finder1( context, tenv );
+                ast::ptr<ast::Expr> arg1 = notZeroExpr( conditionalExpr->arg1 );
                 finder1.find( arg1, ResolveMode::withAdjustment() );
                 if ( finder1.candidates.empty() ) return;
 
                 // candidates for true result
-                // FIX ME: resolves and runs arg1 twice when arg2 is missing.
-                ast::Expr const * arg2 = conditionalExpr->arg2;
-                arg2 = arg2 ? arg2 : conditionalExpr->arg1.get();
                 CandidateFinder finder2( context, tenv );
                 finder2.allowVoid = true;
-                finder2.find( arg2, ResolveMode::withAdjustment() );
+                finder2.find( conditionalExpr->arg2, ResolveMode::withAdjustment() );
                 if ( finder2.candidates.empty() ) return;
 
@@ -1899 +1897 @@
                                         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);
@@ -2200 +2198 @@
 }
 
-const ast::Expr * createCondExpr( const ast::Expr * expr ) {
-        assert( expr );
-        return new ast::CastExpr( expr->location,
-                ast::UntypedExpr::createCall( expr->location,
-                        "?!=?",
-                        {
-                                expr,
-                                new ast::ConstantExpr( expr->location,
-                                        new ast::ZeroType(), "0", std::make_optional( 0ull )
-                                ),
-                        }
-                ),
-                new ast::BasicType( ast::BasicType::SignedInt )
-        );
-}
-
 } // namespace ResolvExpr