Changes in src/Parser/StatementNode.cc [936e9f4: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 : Wed Aug 16 16:39:43 2017
-// Update Count     : 340
+// Last Modified On : Thu Aug 17 16:01:31 2017
+// Update Count     : 345
 //
 
@@ -24 +24 @@
 #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
@@ -98 +99 @@
         } // if
 
-        return new IfStmt( noLabels, notZeroExpr(
-                                                           /*ctl->condition
-                                                                 ?*/ maybeMoveBuild< Expression >(ctl->condition)
-                                                                 /*: new VariableExpr( init.end() )*/ )
-                                                   , thenb, elseb );
-        // ret->initialization = init;
-        // delete ctl;
-        // assert( ret );
-        // return ret;
+        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 );
 }