Changeset dac593fd for src/Parser/StatementNode.cc

Timestamp:

Aug 12, 2016, 11:24:15 AM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9903ebb

Parents:

71b5d4d3 (diff), 1ca15c1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/StatementNode.cc (modified) (9 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 22:08:38 2016
-// Update Count     : 173
+// Last Modified On : Thu Aug 11 16:19:45 2016
+// Update Count     : 210
 //
 
@@ -118 +118 @@
 
 StatementNode *StatementNode::append_last_case( StatementNode *stmt ) {
+        assert( false );
         if ( stmt != 0 ) {
                 StatementNode *next = ( StatementNode *)get_link();
                 if ( next && ( next->get_type() == StatementNode::Case || next->get_type() == StatementNode::Default ) )
-                        next->append_last_case ( stmt );
+                        next->append_last_case( stmt );
                 else
                         if ( block == 0 )
@@ -128 +129 @@
                                 block->set_link( stmt );
         } // if
+        return this;
+}
+
+StatementNode *StatementNode2::append_last_case( StatementNode *stmt ) {
+        StatementNode *prev = this;
+        for ( StatementNode * curr = prev; curr != nullptr; curr = (StatementNode *)curr->get_link() ) {
+                StatementNode2 *node = dynamic_cast<StatementNode2 *>(curr);
+                assert( node );
+                assert( dynamic_cast<CaseStmt *>(node->stmt) );
+                prev = curr;
+        } // for
+        StatementNode2 *node = dynamic_cast<StatementNode2 *>(prev);
+        std::list<Statement *> stmts;
+        buildList( stmt, stmts );
+        CaseStmt * caseStmt;
+        caseStmt = dynamic_cast<CaseStmt *>(node->stmt);
+        caseStmt->get_statements().splice( caseStmt->get_statements().end(), stmts );
         return this;
 }
@@ -205 +223 @@
                                 return new NullStmt( labs );
                 }
+                assert( false );
           case If:
                 // {
@@ -220 +239 @@
                 assert( false );
           case Switch:
-                //return new SwitchStmt( labs, maybeBuild<Expression>(get_control()), branches );
+                // return new SwitchStmt( labs, maybeBuild<Expression>(get_control()), branches );
                 assert( false );
           case Case:
-                return new CaseStmt( labs, maybeBuild<Expression>(get_control() ), branches );
+                //return new CaseStmt( labs, maybeBuild<Expression>(get_control() ), branches );
                 assert( false );
           case Default:
-                return new CaseStmt( labs, 0, branches, true );
+                //return new CaseStmt( labs, 0, branches, true );
                 assert( false );
           case While:
@@ -260 +279 @@
                 assert( false );
           case Goto:
-                {
-                        if ( get_target() == "" ) {                                     // computed goto
-                                assert( get_control() != 0 );
-                                return new BranchStmt( labs, maybeBuild<Expression>(get_control()), BranchStmt::Goto );
-                        } // if
-
-                        return new BranchStmt( labs, get_target(), BranchStmt::Goto );
-                }
+                // {
+                //      if ( get_target() == "" ) {                                     // computed goto
+                //              assert( get_control() != 0 );
+                //              return new BranchStmt( labs, maybeBuild<Expression>(get_control()), BranchStmt::Goto );
+                //      } // if
+
+                //      return new BranchStmt( labs, get_target(), BranchStmt::Goto );
+                // }
+                assert( false );
           case Break:
-                return new BranchStmt( labs, get_target(), BranchStmt::Break );
+                // return new BranchStmt( labs, get_target(), BranchStmt::Break );
                 assert( false );
           case Continue:
-                return new BranchStmt( labs, get_target(), BranchStmt::Continue );
+                // return new BranchStmt( labs, get_target(), BranchStmt::Continue );
                 assert( false );
           case Return:
           case Throw :
-                buildList( get_control(), exps );
-                if ( exps.size() ==0 )
-                        return new ReturnStmt( labs, 0, type == Throw );
-                if ( exps.size() > 0 )
-                        return new ReturnStmt( labs, exps.back(), type == Throw );
+                // buildList( get_control(), exps );
+                // if ( exps.size() ==0 )
+                //      return new ReturnStmt( labs, 0, type == Throw );
+                // if ( exps.size() > 0 )
+                //      return new ReturnStmt( labs, exps.back(), type == Throw );
+                assert( false );
           case Try:
                 {
@@ -314 +335 @@
 }
 
+Statement *build_expr( ExpressionNode *ctl ) {
+        Expression *e = maybeBuild< Expression >( ctl );
+
+        if ( e )
+                return new ExprStmt( noLabels, e );
+        else
+                return new NullStmt( noLabels );
+}
+
 Statement *build_if( ExpressionNode *ctl, StatementNode *then_stmt, StatementNode *else_stmt ) {
         Statement *thenb, *elseb = 0;
@@ -338 +368 @@
 Statement *build_case( ExpressionNode *ctl ) {
         std::list<Statement *> branches;
-        buildList<Statement, StatementNode>( nullptr, branches );
         return new CaseStmt( noLabels, maybeBuild<Expression>(ctl), branches );
 }
@@ -377 +406 @@
 Statement *build_branch( std::string identifier, BranchStmt::Type kind ) {
         return new BranchStmt( noLabels, identifier, kind );
+}
+Statement *build_computedgoto( ExpressionNode *ctl ) {
+        return new BranchStmt( noLabels, maybeBuild<Expression>(ctl), BranchStmt::Goto );
+}
+
+Statement *build_return( ExpressionNode *ctl ) {
+        std::list<Expression *> exps;
+        buildList( ctl, exps );
+        return new ReturnStmt( noLabels, exps.size() > 0 ? exps.back() : nullptr );
+}
+Statement *build_throw( ExpressionNode *ctl ) {
+        std::list<Expression *> exps;
+        buildList( ctl, exps );
+        return new ReturnStmt( noLabels, exps.size() > 0 ? exps.back() : nullptr, true );
 }