Changeset ab780e6 for src/ResolvExpr/CandidateFinder.cpp

Timestamp:

Apr 11, 2024, 3:43:48 PM (3 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

b78c54f

Parents:

c4024b46

Message:

notZeroExpr (in the parser) has become createCondExpr (in the resolver). A small part of this, with expressions, had been done previously.

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (4 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
@@ -1587 +1586 @@
         void Finder::postvisit( const ast::LogicalExpr * logicalExpr ) {
                 CandidateFinder finder1( context, tenv );
-                ast::ptr<ast::Expr> arg1 = notZeroExpr( logicalExpr->arg1 );
+                ast::ptr<ast::Expr> arg1 = createCondExpr( logicalExpr->arg1 );
                 finder1.find( arg1, ResolveMode::withAdjustment() );
                 if ( finder1.candidates.empty() ) return;
 
                 CandidateFinder finder2( context, tenv );
-                ast::ptr<ast::Expr> arg2 = notZeroExpr( logicalExpr->arg2 );
+                ast::ptr<ast::Expr> arg2 = createCondExpr( logicalExpr->arg2 );
                 finder2.find( arg2, ResolveMode::withAdjustment() );
                 if ( finder2.candidates.empty() ) return;
@@ -1618 +1617 @@
         void Finder::postvisit( const ast::ConditionalExpr * conditionalExpr ) {
                 // candidates for condition
-                ast::ptr<ast::Expr> arg1 = notZeroExpr( conditionalExpr->arg1 );
+                ast::ptr<ast::Expr> arg1 = createCondExpr( conditionalExpr->arg1 );
                 CandidateFinder finder1( context, tenv );
                 finder1.find( arg1, ResolveMode::withAdjustment() );
@@ -2201 +2200 @@
 }
 
+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