Changeset 61e362f

Timestamp:

Jan 23, 2024, 2:16:13 PM (20 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

71b5aad5

Parents:

a4ed165

Message:

Changed notZeroExpr so that expressions with conditional contexts are handled in the resolver instead of the parser. Bugs kept the same from being done with statements. (Also a bit of clean-up from the last commit and a small fix in code-gen.)

Location:

src

Files:

• CodeGen/CodeGenerator.cpp (modified) (1 diff)
• InitTweak/FixInit.cpp (modified) (1 diff)
• Parser/ExpressionNode.cc (modified) (2 diffs)
• Parser/parserutility.cc (modified) (1 diff)
• Parser/parserutility.h (modified) (1 diff)
• ResolvExpr/CandidateFinder.cpp (modified) (3 diffs)
• main.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cpp

@@ -1135 +1135 @@
                 if ( clause->when_cond ) {
                         output << "when(";
-                        stmt->timeout_cond->accept( *visitor );
+                        clause->when_cond->accept( *visitor );
                         output << ") ";
                 }

src/InitTweak/FixInit.cpp

@@ -1176 +1176 @@
                 throw errors;
         }
-        // return funcDecl;
         return function;
 }

src/Parser/ExpressionNode.cc

@@ -673 +673 @@
                 ast::LogicalFlag flag ) {
         return new ast::LogicalExpr( location,
-                notZeroExpr( maybeMoveBuild( expr_node1 ) ),
-                notZeroExpr( maybeMoveBuild( expr_node2 ) ),
+                maybeMoveBuild( expr_node1 ),
+                maybeMoveBuild( expr_node2 ),
                 flag
         );
@@ -713 +713 @@
                 ExpressionNode * expr_node3 ) {
         return new ast::ConditionalExpr( location,
-                notZeroExpr( maybeMoveBuild( expr_node1 ) ),
+                maybeMoveBuild( expr_node1 ),
                 maybeMoveBuild( expr_node2 ),
                 maybeMoveBuild( expr_node3 )

src/Parser/parserutility.cc

@@ -27 +27 @@
 //    if ( (int)(x != 0) ) ...
 
-ast::Expr * notZeroExpr( ast::Expr * orig ) {
+ast::Expr * notZeroExpr( const ast::Expr * orig ) {
         return ( !orig ) ? nullptr : new ast::CastExpr( orig->location,
                 ast::UntypedExpr::createCall( orig->location,

src/Parser/parserutility.h

@@ -21 +21 @@
 }
 
-ast::Expr * notZeroExpr( ast::Expr *orig );
+ast::Expr * notZeroExpr( const ast::Expr *orig );
 
 template< typename T >

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
@@ -1502 +1503 @@
         void Finder::postvisit( const ast::LogicalExpr * logicalExpr ) {
                 CandidateFinder finder1( context, tenv );
-                finder1.find( logicalExpr->arg1, ResolveMode::withAdjustment() );
+                ast::ptr<ast::Expr> arg1 = notZeroExpr( logicalExpr->arg1 );
+                finder1.find( arg1, ResolveMode::withAdjustment() );
                 if ( finder1.candidates.empty() ) return;
 
                 CandidateFinder finder2( context, tenv );
-                finder2.find( logicalExpr->arg2, ResolveMode::withAdjustment() );
+                ast::ptr<ast::Expr> arg2 = notZeroExpr( logicalExpr->arg2 );
+                finder2.find( arg2, ResolveMode::withAdjustment() );
                 if ( finder2.candidates.empty() ) return;
 
@@ -1532 +1535 @@
                 // candidates for condition
                 CandidateFinder finder1( context, tenv );
-                finder1.find( conditionalExpr->arg1, ResolveMode::withAdjustment() );
+                ast::ptr<ast::Expr> arg1 = notZeroExpr( conditionalExpr->arg1 );
+                finder1.find( arg1, ResolveMode::withAdjustment() );
                 if ( finder1.candidates.empty() ) return;
 

src/main.cc

@@ -82 +82 @@
 #include "Validate/ReturnCheck.hpp"         // for checkReturnStatements
 #include "Validate/VerifyCtorDtorAssign.hpp" // for verifyCtorDtorAssign
-#include "Validate/ReplacePseudoFunc.hpp"
+#include "Validate/ReplacePseudoFunc.hpp"   // for replacePseudoFunc
 #include "Virtual/ExpandCasts.h"            // for expandCasts
 #include "Virtual/VirtualDtor.hpp"          // for implementVirtDtors