Changeset 8688ce1 for src/ControlStruct

Timestamp:

Aug 4, 2016, 12:29:54 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:

76e8c55

Parents:

e80ebe5

Message:

move case-list management into parser

Location:

src/ControlStruct

Files:

• CaseRangeMutator.cc (deleted)
• CaseRangeMutator.h (deleted)
• MLEMutator.cc (modified) (3 diffs)
• Mutate.cc (modified) (4 diffs)
• module.mk (modified) (2 diffs)

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:36:51 2016
-// Update Count     : 197
+// Last Modified On : Thu Aug  4 11:21:32 2016
+// Update Count     : 202
 //
 
@@ -128 +128 @@
                 Label brkLabel = generator->newLabel("switchBreak");
                 enclosingControlStructures.push_back( Entry(switchStmt, brkLabel) );
-                mutateAll( switchStmt->get_branches(), *this );
+                mutateAll( switchStmt->get_statements(), *this );
 
                 Entry &e = enclosingControlStructures.back();
@@ -138 +138 @@
                         // switch should be CastStmts), append the exit label + break to the last case statement; create a default
                         // case if there are no cases
-                        std::list< Statement * > &branches = switchStmt->get_branches();
-                        if ( branches.empty() ) {
-                                branches.push_back( CaseStmt::makeDefault() );
-                        } // if
-
-                        if ( CaseStmt * c = dynamic_cast< CaseStmt * >( branches.back() ) ) {
+                        std::list< Statement * > &statements = switchStmt->get_statements();
+                        if ( statements.empty() ) {
+                                statements.push_back( CaseStmt::makeDefault() );
+                        } // if
+
+                        if ( CaseStmt * c = dynamic_cast< CaseStmt * >( statements.back() ) ) {
                                 std::list<Label> temp; temp.push_back( brkLabel );
                                 c->get_statements().push_back( new BranchStmt( temp, Label("brkLabel"), BranchStmt::Break ) );
-                        } else assert(0); // as of this point, all branches of a switch are still CaseStmts
+                        } else assert(0); // as of this point, all statements of a switch are still CaseStmts
                 } // if
 

src/ControlStruct/Mutate.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:37:45 2016
-// Update Count     : 8
+// Last Modified On : Thu Aug  4 11:39:08 2016
+// Update Count     : 9
 //
 
@@ -22 +22 @@
 #include "LabelFixer.h"
 #include "MLEMutator.h"
-#include "CaseRangeMutator.h"
 #include "ForExprMutator.h"
 #include "LabelTypeChecker.h"
@@ -41 +40 @@
                 LabelFixer lfix;
 
-                // expand case ranges and turn fallthru into a null statement
-                CaseRangeMutator ranges;
-
                 //ExceptMutator exc;
                 // LabelTypeChecker lbl;
@@ -49 +45 @@
                 mutateAll( translationUnit, formut );
                 acceptAll( translationUnit, lfix );
-                mutateAll( translationUnit, ranges );
                 //mutateAll( translationUnit, exc );
                 //acceptAll( translationUnit, lbl );

src/ControlStruct/module.mk

@@ -11 +11 @@
 ## Created On       : Mon Jun  1 17:49:17 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Tue Jul 12 17:40:31 2016
-## Update Count     : 2
+## Last Modified On : Thu Aug  4 11:38:06 2016
+## Update Count     : 3
 ###############################################################################
 
@@ -18 +18 @@
         ControlStruct/LabelFixer.cc \
         ControlStruct/MLEMutator.cc \
-        ControlStruct/CaseRangeMutator.cc \
         ControlStruct/Mutate.cc \
         ControlStruct/ForExprMutator.cc \