Index: src/ControlStruct/CaseRangeMutator.cc =================================================================== --- src/ControlStruct/CaseRangeMutator.cc (revision 99f11dd9fe298c7ab585c6387048bc8797d4dde4) +++ src/ControlStruct/CaseRangeMutator.cc (revision 4e06c1ebfdf762654ec91b9a78bae607f25fba19) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Jun 30 13:28:55 2016 -// Update Count : 8 +// Last Modified On : Tue Jul 12 17:35:13 2016 +// Update Count : 9 // @@ -28,9 +28,4 @@ namespace ControlStruct { - Statement *CaseRangeMutator::mutate( ChooseStmt *chooseStmt ) { - // There shouldn't be any `choose' statements by now, throw an exception or something. - throw( 0 ) ; /* FIXME */ - } - Statement *CaseRangeMutator::mutate( SwitchStmt *switchStmt ) { std::list< Statement * > &cases = switchStmt->get_branches(); @@ -69,9 +64,4 @@ return switchStmt; - } - - Statement *CaseRangeMutator::mutate( FallthruStmt *fallthruStmt ) { - //delete fallthruStmt; - return new NullStmt(); } Index: src/ControlStruct/CaseRangeMutator.h =================================================================== --- src/ControlStruct/CaseRangeMutator.h (revision 99f11dd9fe298c7ab585c6387048bc8797d4dde4) +++ src/ControlStruct/CaseRangeMutator.h (revision 4e06c1ebfdf762654ec91b9a78bae607f25fba19) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue May 19 15:22:51 2015 -// Update Count : 3 +// Last Modified On : Tue Jul 12 17:35:30 2016 +// Update Count : 4 // @@ -27,7 +27,5 @@ CaseRangeMutator() {} - virtual Statement *mutate( ChooseStmt * ); virtual Statement *mutate( SwitchStmt * ); - virtual Statement *mutate( FallthruStmt * ); virtual Statement *mutate( CaseStmt * ); private: Index: src/ControlStruct/ChooseMutator.cc =================================================================== --- src/ControlStruct/ChooseMutator.cc (revision 99f11dd9fe298c7ab585c6387048bc8797d4dde4) +++ (revision ) @@ -1,71 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// ChooseMutator.cc -- -// -// Author : Rodolfo G. Esteves -// Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Wed Jun 03 15:30:20 2015 -// Update Count : 5 -// - -#include - -#include "SynTree/Statement.h" -#include "ChooseMutator.h" - -namespace ControlStruct { - Statement *ChooseMutator::mutate( ChooseStmt *chooseStmt ) { - bool enclosingChoose = insideChoose; - insideChoose = true; - mutateAll( chooseStmt->get_branches(), *this ); - insideChoose = enclosingChoose; - return new SwitchStmt( chooseStmt->get_labels(), chooseStmt->get_condition(), chooseStmt->get_branches() ); - } - - Statement *ChooseMutator::mutate( SwitchStmt *switchStmt ) { - bool enclosingChoose = insideChoose; - insideChoose = false; - mutateAll( switchStmt->get_branches(), *this ); - insideChoose = enclosingChoose; - return switchStmt; - } - - Statement *ChooseMutator::mutate( FallthruStmt *fallthruStmt ) { - delete fallthruStmt; - return new NullStmt(); - } - - Statement* ChooseMutator::mutate( CaseStmt *caseStmt ) { - std::list< Statement * > &stmts = caseStmt->get_statements(); - - // the difference between switch and choose is that switch has an implicit fallthrough - // to the next case, whereas choose has an implicit break at the end of the current case. - // thus to transform a choose statement into a switch, we only need to insert breaks at the - // end of any case that doesn't already end in a break and that doesn't end in a fallthru - - if ( insideChoose ) { - BranchStmt *posBrk; - if ( (( posBrk = dynamic_cast< BranchStmt * > ( stmts.back() ) ) && - ( posBrk->get_type() == BranchStmt::Break )) // last statement in the list is a (superfluous) 'break' - || dynamic_cast< FallthruStmt * > ( stmts.back() ) ) - ; - else { - stmts.push_back( new BranchStmt( std::list< Label >(), "", BranchStmt::Break ) ); - } // if - } // if - - mutateAll ( stmts, *this ); - return caseStmt; - } -} // namespace ControlStruct - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/ControlStruct/ChooseMutator.h =================================================================== --- src/ControlStruct/ChooseMutator.h (revision 99f11dd9fe298c7ab585c6387048bc8797d4dde4) +++ (revision ) @@ -1,44 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// ChooseMutator.h -- -// -// Author : Rodolfo G. Esteves -// Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Tue May 19 15:33:11 2015 -// Update Count : 3 -// - -#ifndef CHOOSE_MUTATOR_H -#define CHOOSE_MUTATOR_H - -#include "SynTree/Mutator.h" - -#include "Common/utility.h" - -namespace ControlStruct { - /// transform choose statements into switch statements - class ChooseMutator : public Mutator { - public: - ChooseMutator() : insideChoose( false ) {} - - virtual Statement *mutate( ChooseStmt * ); - virtual Statement *mutate( SwitchStmt * ); - virtual Statement *mutate( FallthruStmt * ); - virtual Statement *mutate( CaseStmt * ); - private: - bool insideChoose; - }; -} // namespace ControlStruct - -#endif // CHOOSE_MUTATOR_H - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/ControlStruct/LabelFixer.h =================================================================== --- src/ControlStruct/LabelFixer.h (revision 99f11dd9fe298c7ab585c6387048bc8797d4dde4) +++ src/ControlStruct/LabelFixer.h (revision 4e06c1ebfdf762654ec91b9a78bae607f25fba19) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jan 25 21:22:22 2016 -// Update Count : 32 +// Last Modified On : Tue Jul 12 17:36:16 2016 +// Update Count : 33 // @@ -46,6 +46,4 @@ virtual void visit( ForStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); } virtual void visit( SwitchStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); } - virtual void visit( ChooseStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); } - virtual void visit( FallthruStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); } virtual void visit( CaseStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); } virtual void visit( ReturnStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); } Index: src/ControlStruct/MLEMutator.cc =================================================================== --- src/ControlStruct/MLEMutator.cc (revision 99f11dd9fe298c7ab585c6387048bc8797d4dde4) +++ src/ControlStruct/MLEMutator.cc (revision 4e06c1ebfdf762654ec91b9a78bae607f25fba19) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Jul 6 17:40:02 2016 -// Update Count : 196 +// Last Modified On : Tue Jul 12 17:36:51 2016 +// Update Count : 197 // @@ -248,8 +248,4 @@ return handleSwitchStmt( switchStmt ); } - - Statement *MLEMutator::mutate( ChooseStmt *switchStmt ) { - return handleSwitchStmt( switchStmt ); - } } // namespace ControlStruct Index: src/ControlStruct/MLEMutator.h =================================================================== --- src/ControlStruct/MLEMutator.h (revision 99f11dd9fe298c7ab585c6387048bc8797d4dde4) +++ src/ControlStruct/MLEMutator.h (revision 4e06c1ebfdf762654ec91b9a78bae607f25fba19) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Jul 6 18:16:26 2016 -// Update Count : 33 +// Last Modified On : Tue Jul 12 17:37:01 2016 +// Update Count : 34 // @@ -42,5 +42,4 @@ virtual Statement *mutate( IfStmt *ifStmt ) override; virtual Statement *mutate( SwitchStmt *switchStmt ) override; - virtual Statement *mutate( ChooseStmt *switchStmt ) override; Statement *mutateLoop( Statement *bodyLoop, Entry &e ); Index: src/ControlStruct/Mutate.cc =================================================================== --- src/ControlStruct/Mutate.cc (revision 99f11dd9fe298c7ab585c6387048bc8797d4dde4) +++ src/ControlStruct/Mutate.cc (revision 4e06c1ebfdf762654ec91b9a78bae607f25fba19) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Wed Jul 15 14:50:04 2015 -// Update Count : 7 +// Last Modified By : Peter A. Buhr +// Last Modified On : Tue Jul 12 17:37:45 2016 +// Update Count : 8 // @@ -20,5 +20,4 @@ #include "Mutate.h" -#include "ChooseMutator.h" #include "LabelFixer.h" #include "MLEMutator.h" @@ -39,13 +38,9 @@ ForExprMutator formut; - // transform choose statements into switch statements - ChooseMutator chmut; - - // normalizes label definitions and generates multi-level - // exit labels + // normalizes label definitions and generates multi-level exit labels LabelFixer lfix; // expand case ranges and turn fallthru into a null statement - CaseRangeMutator ranges; // has to run after ChooseMutator + CaseRangeMutator ranges; //ExceptMutator exc; @@ -53,5 +48,4 @@ mutateAll( translationUnit, formut ); - mutateAll( translationUnit, chmut ); acceptAll( translationUnit, lfix ); mutateAll( translationUnit, ranges ); Index: src/ControlStruct/module.mk =================================================================== --- src/ControlStruct/module.mk (revision 99f11dd9fe298c7ab585c6387048bc8797d4dde4) +++ src/ControlStruct/module.mk (revision 4e06c1ebfdf762654ec91b9a78bae607f25fba19) @@ -11,6 +11,6 @@ ## Created On : Mon Jun 1 17:49:17 2015 ## Last Modified By : Peter A. Buhr -## Last Modified On : Mon Jun 1 17:51:45 2015 -## Update Count : 1 +## Last Modified On : Tue Jul 12 17:40:31 2016 +## Update Count : 2 ############################################################################### @@ -20,5 +20,4 @@ ControlStruct/CaseRangeMutator.cc \ ControlStruct/Mutate.cc \ - ControlStruct/ChooseMutator.cc \ ControlStruct/ForExprMutator.cc \ ControlStruct/LabelTypeChecker.cc