Changes in src/Parser/StatementNode.cc [2f22cc4:658fafe4]

File:

• src/Parser/StatementNode.cc (modified) (10 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 10 13:54:21 2016
-// Update Count     : 170
+// Last Modified On : Tue Jul 12 17:21:02 2016
+// Update Count     : 133
 //
 
@@ -106 +106 @@
         return this;
 }
+
+// StatementNode *StatementNode::add_controlexp( ExpressionNode *e ) {
+//      if ( control && e )
+//              control->add_to_list( e ); // xxx - check this
+//      return this;
+// }
 
 StatementNode *StatementNode::append_block( StatementNode *stmt ) {
@@ -170 +176 @@
                 } // if
                 if ( block ) {
-                        os << string( indent + ParseNode::indent_by, ' ' ) << "Cases: " << endl;
+                        os << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
                         block->printList( os, indent + 2 * ParseNode::indent_by );
                 } // if
@@ -206 +212 @@
                 }
           case If:
-                // {
-                //      Statement *thenb = 0, *elseb = 0;
-                //      assert( branches.size() >= 1 );
-
-                //      thenb = branches.front();
-                //      branches.pop_front();
-                //      if ( ! branches.empty() ) {
-                //              elseb = branches.front();
-                //              branches.pop_front();
-                //      } // if
-                //      return new IfStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), thenb, elseb );
-                // }
-                assert( false );
+                {
+                        Statement *thenb = 0, *elseb = 0;
+                        assert( branches.size() >= 1 );
+
+                        thenb = branches.front();
+                        branches.pop_front();
+                        if ( ! branches.empty() ) {
+                                elseb = branches.front();
+                                branches.pop_front();
+                        } // if
+                        return new IfStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), thenb, elseb );
+                }
+          case While:
+                assert( branches.size() == 1 );
+                return new WhileStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), branches.front() );
+          case Do:
+                assert( branches.size() == 1 );
+                return new WhileStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), branches.front(), true );
+          case For:
+                {
+                        assert( branches.size() == 1 );
+
+                        ForCtlExprNode *ctl = dynamic_cast<ForCtlExprNode *>( get_control() );
+                        assert( ctl != 0 );
+
+                        std::list<Statement *> init;
+                        if ( ctl->get_init() != 0 ) {
+                                buildList( ctl->get_init(), init );
+                        } // if
+
+                        Expression *cond = 0;
+                        if ( ctl->get_condition() != 0 )
+                                cond = notZeroExpr( maybeBuild<Expression>(ctl->get_condition()) );
+
+                        Expression *incr = 0;
+                        if ( ctl->get_change() != 0 )
+                                incr = maybeBuild<Expression>(ctl->get_change());
+
+                        return new ForStmt( labs, init, cond, incr, branches.front() );
+                }
           case Switch:
-                //return new SwitchStmt( labs, maybeBuild<Expression>(get_control()), branches );
-                assert( false );
+                return new SwitchStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Case:
-                return new CaseStmt( labs, maybeBuild<Expression>(get_control() ), branches );
+                return new CaseStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Default:
                 return new CaseStmt( labs, 0, branches, true );
-          case While:
-                // assert( branches.size() == 1 );
-                // return new WhileStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), branches.front() );
-                assert( false );
-          case Do:
-                // assert( branches.size() == 1 );
-                // return new WhileStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), branches.front(), true );
-                assert( false );
-          case For:
-                // {
-                //      assert( branches.size() == 1 );
-
-                //      ForCtlExprNode *ctl = dynamic_cast<ForCtlExprNode *>( get_control() );
-                //      assert( ctl != 0 );
-
-                //      std::list<Statement *> init;
-                //      if ( ctl->get_init() != 0 ) {
-                //              buildList( ctl->get_init(), init );
-                //      } // if
-
-                //      Expression *cond = 0;
-                //      if ( ctl->get_condition() != 0 )
-                //              cond = notZeroExpr( maybeBuild<Expression>(ctl->get_condition()) );
-
-                //      Expression *incr = 0;
-                //      if ( ctl->get_change() != 0 )
-                //              incr = maybeBuild<Expression>(ctl->get_change());
-
-                //      return new ForStmt( labs, init, cond, incr, branches.front() );
-                // }
-                assert( false );
           case Goto:
                 {
@@ -310 +311 @@
 }
 
-Statement *build_if( ExpressionNode *ctl, StatementNode *then_stmt, StatementNode *else_stmt ) {
-        Statement *thenb, *elseb = 0;
-        std::list<Statement *> branches;
-        buildList<Statement, StatementNode>( then_stmt, branches );
-        assert( branches.size() >= 1 );
-        thenb = branches.front();
-
-        if ( else_stmt ) {
-                std::list<Statement *> branches;
-                buildList<Statement, StatementNode>( else_stmt, branches );
-                assert( branches.size() >= 1 );
-                elseb = branches.front();
-        } // if
-        return new IfStmt( noLabels, notZeroExpr( maybeBuild<Expression>(ctl) ), thenb, elseb );
-}
-
-Statement *build_switch( ExpressionNode *ctl, StatementNode *stmt ) {
-        std::list<Statement *> branches;
-        buildList<Statement, StatementNode>( stmt, branches );
-        assert( branches.size() >= 1 );
-        return new SwitchStmt( noLabels, maybeBuild<Expression>(ctl), branches );
-}
-
-Statement *build_while( ExpressionNode *ctl, StatementNode *stmt, bool kind ) {
-        std::list<Statement *> branches;
-        buildList<Statement, StatementNode>( stmt, branches );
-        assert( branches.size() == 1 );
-        return new WhileStmt( noLabels, notZeroExpr( maybeBuild<Expression>(ctl) ), branches.front(), kind );
-}
-
-Statement *build_for( ForCtl *forctl, StatementNode *stmt ) {
-        std::list<Statement *> branches;
-        buildList<Statement, StatementNode>( stmt, branches );
-        assert( branches.size() == 1 );
-
-        std::list<Statement *> init;
-        if ( forctl->init != 0 ) {
-                buildList( forctl->init, init );
-        } // if
-
-        Expression *cond = 0;
-        if ( forctl->condition != 0 )
-                cond = notZeroExpr( maybeBuild<Expression>(forctl->condition) );
-
-        Expression *incr = 0;
-        if ( forctl->change != 0 )
-                incr = maybeBuild<Expression>(forctl->change);
-
-        delete forctl;
-        return new ForStmt( noLabels, init, cond, incr, branches.front() );
-}
-
 
 CompoundStmtNode::CompoundStmtNode() : first( 0 ), last( 0 ) {}
@@ -407 +356 @@
 
 
-AsmStmtNode::AsmStmtNode( Type t, bool voltile, ConstantExpr *instruction, ExpressionNode *output, ExpressionNode *input, ExpressionNode *clobber, LabelNode *gotolabels ) :
+AsmStmtNode::AsmStmtNode( Type t, bool voltile, ConstantNode *instruction, ExpressionNode *output, ExpressionNode *input, ConstantNode *clobber, LabelNode *gotolabels ) :
         StatementNode( t ), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ) {
         if ( gotolabels ) {
@@ -416 +365 @@
 
 AsmStmtNode::~AsmStmtNode() {
-        delete output; delete input; delete clobber;
+        delete instruction; delete output; delete input; delete clobber;
 }
 
@@ -424 +373 @@
         if ( instruction ) {
                 os << string( indent + ParseNode::indent_by, ' ' ) << "Instruction:" << endl;
-//              instruction->printList( os, indent + 2 * ParseNode::indent_by );
+                instruction->printList( os, indent + 2 * ParseNode::indent_by );
         } // if
         if ( output ) {
@@ -436 +385 @@
         if ( clobber ) {
                 os << string( indent + ParseNode::indent_by, ' ' ) << "Clobber:" << endl;
-//              clobber->printList( os, indent + 2 * ParseNode::indent_by );
+                clobber->printList( os, indent + 2 * ParseNode::indent_by );
         } // if
         if ( ! gotolabels.empty() ) {
@@ -465 +414 @@
         buildList( clobber, clob );
         std::list< Label > gotolabs = gotolabels;
-        return new AsmStmt( labs, voltile, instruction, out, in, clob, gotolabs );
+        return new AsmStmt( labs, voltile, (ConstantExpr *)maybeBuild< Expression >( instruction ), out, in, clob, gotolabs );
 }