Changes in src/Parser/StatementNode.cc [ab780e6:44adf1b]

File:

• src/Parser/StatementNode.cc (modified) (10 diffs)

src/Parser/StatementNode.cc

@@ -122 +122 @@
         ast::Expr * cond = nullptr;
         if ( ctl->condition ) {
-                cond = maybeMoveBuild( ctl->condition );
+                // compare the provided condition against 0
+                cond = notZeroExpr( maybeMoveBuild( ctl->condition ) );
         } else {
                 for ( ast::ptr<ast::Stmt> & stmt : inits ) {
@@ -128 +129 @@
                         auto declStmt = stmt.strict_as<ast::DeclStmt>();
                         auto dwt = declStmt->decl.strict_as<ast::DeclWithType>();
-                        ast::Expr * nze = new ast::VariableExpr( dwt->location, dwt );
+                        ast::Expr * nze = notZeroExpr( new ast::VariableExpr( dwt->location, dwt ) );
                         cond = cond ? new ast::LogicalExpr( dwt->location, cond, nze, ast::AndExpr ) : nze;
                 }
@@ -199 +200 @@
         // do-while cannot have declarations in the contitional, so init is always empty
         return new ast::WhileDoStmt( location,
-                maybeMoveBuild( ctl ),
+                notZeroExpr( maybeMoveBuild( ctl ) ),
                 buildMoveSingle( stmt ),
                 buildMoveOptional( else_ ),
@@ -212 +213 @@
 
         ast::Expr * astcond = nullptr;                                          // maybe empty
-        astcond = maybeMoveBuild( forctl->condition );
+        astcond = notZeroExpr( maybeMoveBuild( forctl->condition ) );
 
         ast::Expr * astincr = nullptr;                                          // maybe empty
@@ -329 +330 @@
         clause->target = maybeBuild( targetExpr );
         clause->stmt = maybeMoveBuild( stmt );
-        clause->when_cond = maybeMoveBuild( when );
+        clause->when_cond = notZeroExpr( maybeMoveBuild( when ) );
 
         ExpressionNode * next = targetExpr->next;
@@ -344 +345 @@
 ast::WaitForStmt * build_waitfor_else( const CodeLocation & location, ast::WaitForStmt * existing, ExpressionNode * when, StatementNode * stmt ) {
         existing->else_stmt = maybeMoveBuild( stmt );
-        existing->else_cond = maybeMoveBuild( when );
+        existing->else_cond = notZeroExpr( maybeMoveBuild( when ) );
 
         (void)location;
@@ -353 +354 @@
         existing->timeout_time = maybeMoveBuild( timeout );
         existing->timeout_stmt = maybeMoveBuild( stmt );
-        existing->timeout_cond = maybeMoveBuild( when );
+        existing->timeout_cond = notZeroExpr( maybeMoveBuild( when ) );
 
         (void)location;
@@ -361 +362 @@
 ast::WaitUntilStmt::ClauseNode * build_waituntil_clause( const CodeLocation & loc, ExpressionNode * when, ExpressionNode * targetExpr, StatementNode * stmt ) {
         ast::WhenClause * clause = new ast::WhenClause( loc );
-        clause->when_cond = maybeMoveBuild( when );
+        clause->when_cond = notZeroExpr( maybeMoveBuild( when ) );
         clause->stmt = maybeMoveBuild( stmt );
         clause->target = maybeMoveBuild( targetExpr );
@@ -368 +369 @@
 ast::WaitUntilStmt::ClauseNode * build_waituntil_else( const CodeLocation & loc, ExpressionNode * when, StatementNode * stmt ) {
         ast::WhenClause * clause = new ast::WhenClause( loc );
-        clause->when_cond = maybeMoveBuild( when );
+        clause->when_cond = notZeroExpr( maybeMoveBuild( when ) );
         clause->stmt = maybeMoveBuild( stmt );
         return new ast::WaitUntilStmt::ClauseNode( ast::WaitUntilStmt::ClauseNode::Op::ELSE, clause );
@@ -507 +508 @@
 
         ast::Expr * astcond = nullptr;                                          // maybe empty
-        astcond = maybeMoveBuild( forctl->condition );
+        astcond = notZeroExpr( maybeMoveBuild( forctl->condition ) );
 
         ast::Expr * astincr = nullptr;                                          // maybe empty