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

File:

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

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Sep  1 23:25:23 2017
-// Update Count     : 346
+// Last Modified On : Thu Aug 17 16:01:31 2017
+// Update Count     : 345
 //
 
@@ -99 +99 @@
         } // if
 
-        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;
-                }
-        }
+        Expression * cond = ctl->condition ? maybeMoveBuild< Expression >(ctl->condition) : new VariableExpr( dynamic_cast<DeclarationWithType *>( dynamic_cast<DeclStmt *>( init.back() )->decl ) );
         delete ctl;
-        return new IfStmt( noLabels, cond, thenb, elseb, init );
+        return new IfStmt( noLabels, notZeroExpr( cond ), thenb, elseb, init );
 }
 
@@ -300 +288 @@
 }
 
-Statement *build_asmstmt( bool voltile, Expression *instruction, ExpressionNode *output, ExpressionNode *input, ExpressionNode *clobber, LabelNode *gotolabels ) {
+Statement *build_asmstmt( bool voltile, ConstantExpr *instruction, ExpressionNode *output, ExpressionNode *input, ExpressionNode *clobber, LabelNode *gotolabels ) {
         std::list< Expression * > out, in;
         std::list< ConstantExpr * > clob;