Changes in src/Parser/StatementNode.cc [2065609:a01f7c94]

File:

• src/Parser/StatementNode.cc (modified) (1 diff)

src/Parser/StatementNode.cc

@@ -99 +99 @@
         } // if
 
-        Expression * cond = ctl->condition ? maybeMoveBuild< Expression >(ctl->condition) : new VariableExpr( dynamic_cast<DeclarationWithType *>( dynamic_cast<DeclStmt *>( init.back() )->decl ) );
+        Expression * cond = nullptr;
+        if ( ctl->condition ) {
+                // compare the provided condition against 0
+                cond =  notZeroExpr( maybeMoveBuild< Expression >(ctl->condition) );
+        } else {
+                for ( Statement * stmt : init ) {
+                        // build the && of all of the declared variables compared against 0
+                        DeclStmt * declStmt = safe_dynamic_cast< DeclStmt * >( stmt );
+                        DeclarationWithType * dwt = safe_dynamic_cast< DeclarationWithType * >( declStmt->decl );
+                        Expression * nze = notZeroExpr( new VariableExpr( dwt ) );
+                        cond = cond ? new LogicalExpr( cond, nze, true ) : nze;
+                }
+        }
         delete ctl;
-        return new IfStmt( noLabels, notZeroExpr( cond ), thenb, elseb, init );
+        return new IfStmt( noLabels, cond, thenb, elseb, init );
 }