Changes in src/Parser/StatementNode.cc [20519b7:6d49ea3]

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 : Tue Jul 11 21:23:15 2017
-// Update Count     : 331
-//
-
-#include <list>
-#include <algorithm>
-#include <cassert>
-
-#include "ParseNode.h"
-#include "SynTree/Statement.h"
-#include "SynTree/Expression.h"
-#include "parserutility.h"
-#include "Common/utility.h"
+// Last Modified On : Thu Aug 17 16:01:31 2017
+// Update Count     : 345
+//
+
+#include <cassert>                 // for assert, safe_dynamic_cast, assertf
+#include <list>                    // for list
+#include <memory>                  // for unique_ptr
+#include <string>                  // for string
+
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Common/utility.h"        // for maybeMoveBuild, maybeBuild
+#include "ParseNode.h"             // for StatementNode, ExpressionNode, bui...
+#include "SynTree/Expression.h"    // for Expression, ConstantExpr
+#include "SynTree/Label.h"         // for Label, noLabels
+#include "SynTree/Declaration.h"
+#include "SynTree/Statement.h"     // for Statement, BranchStmt, CaseStmt
+#include "parserutility.h"         // for notZeroExpr
+
+class Declaration;
 
 using namespace std;
@@ -74 +80 @@
 }
 
-Statement *build_if( ExpressionNode *ctl, StatementNode *then_stmt, StatementNode *else_stmt ) {
+Statement *build_if( IfCtl * ctl, StatementNode *then_stmt, StatementNode *else_stmt ) {
         Statement *thenb, *elseb = 0;
         std::list< Statement * > branches;
@@ -87 +93 @@
                 elseb = branches.front();
         } // if
-        return new IfStmt( noLabels, notZeroExpr( maybeMoveBuild< Expression >(ctl) ), thenb, elseb );
+        
+        std::list< Statement * > init;
+        if ( ctl->init != 0 ) {
+                buildMoveList( ctl->init, init );
+        } // if
+
+        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, notZeroExpr( cond ), thenb, elseb, init );
 }