Changeset 321f55d for src/Parser/StatementNode.cc

Timestamp:

Aug 10, 2016, 11:31:15 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

27fefeb6

Parents:

2f22cc4

Message:

more refactoring of parser code

File:

• src/Parser/StatementNode.cc (modified) (7 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 : Wed Aug 10 22:08:38 2016
+// Update Count     : 173
 //
 
@@ -224 +224 @@
           case Case:
                 return new CaseStmt( labs, maybeBuild<Expression>(get_control() ), branches );
+                assert( false );
           case Default:
                 return new CaseStmt( labs, 0, branches, true );
+                assert( false );
           case While:
                 // assert( branches.size() == 1 );
@@ -268 +270 @@
           case Break:
                 return new BranchStmt( labs, get_target(), BranchStmt::Break );
+                assert( false );
           case Continue:
                 return new BranchStmt( labs, get_target(), BranchStmt::Continue );
+                assert( false );
           case Return:
           case Throw :
@@ -314 +318 @@
         std::list<Statement *> branches;
         buildList<Statement, StatementNode>( then_stmt, branches );
-        assert( branches.size() >= 1 );
+        assert( branches.size() == 1 );
         thenb = branches.front();
 
@@ -320 +324 @@
                 std::list<Statement *> branches;
                 buildList<Statement, StatementNode>( else_stmt, branches );
-                assert( branches.size() >= 1 );
+                assert( branches.size() == 1 );
                 elseb = branches.front();
         } // if
@@ -329 +333 @@
         std::list<Statement *> branches;
         buildList<Statement, StatementNode>( stmt, branches );
-        assert( branches.size() >= 1 );
+        assert( branches.size() >= 0 );                                         // size == 0 for switch (...) {}, i.e., no declaration or statements
         return new SwitchStmt( noLabels, maybeBuild<Expression>(ctl), branches );
+}
+Statement *build_case( ExpressionNode *ctl ) {
+        std::list<Statement *> branches;
+        buildList<Statement, StatementNode>( nullptr, branches );
+        return new CaseStmt( noLabels, maybeBuild<Expression>(ctl), branches );
+}
+Statement *build_default() {
+        std::list<Statement *> branches;
+        return new CaseStmt( noLabels, nullptr, branches, true );
 }
 
@@ -360 +373 @@
         delete forctl;
         return new ForStmt( noLabels, init, cond, incr, branches.front() );
+}
+
+Statement *build_branch( std::string identifier, BranchStmt::Type kind ) {
+        return new BranchStmt( noLabels, identifier, kind );
 }