Changes in / [30651b0:1136d96]

Location:

src

Files:

• CodeGen/CodeGenerator.cc (added)
• CodeGen/CodeGenerator.h (added)
• CodeGen/CodeGenerator2.cc (deleted)
• CodeGen/CodeGenerator2.h (deleted)
• CodeGen/GenType.cc (modified) (4 diffs)
• CodeGen/Generate.cc (modified) (3 diffs)
• CodeGen/module.mk (modified) (1 diff)
• Common/utility.h (modified) (2 diffs)
• ControlStruct/ChooseMutator.cc (modified) (2 diffs)
• ControlStruct/LabelFixer.cc (modified) (5 diffs)
• ControlStruct/LabelFixer.h (modified) (3 diffs)
• ControlStruct/LabelGenerator.cc (modified) (2 diffs)
• ControlStruct/LabelGenerator.h (modified) (3 diffs)
• ControlStruct/MLEMutator.cc (modified) (6 diffs)
• ControlStruct/MLEMutator.h (modified) (5 diffs)
• ControlStruct/Mutate.cc (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• SynTree/Mutator.h (modified) (2 diffs)
• SynTree/ObjectDecl.cc (modified) (2 diffs)
• SynTree/Statement.cc (modified) (2 diffs)
• SynTree/Statement.h (modified) (2 diffs)
• examples/control_structures.c (modified) (1 diff)

src/CodeGen/GenType.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 23:38:22 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jun 02 11:07:25 2015
+// Update Count     : 3
 //
 
@@ -18 +18 @@
 
 #include "GenType.h"
-#include "CodeGenerator2.h"
+#include "CodeGenerator.h"
 #include "SynTree/Visitor.h"
 #include "SynTree/Type.h"
@@ -97 +97 @@
                 } // if
                 if ( dimension != 0 ) {
-                        CodeGenerator2 cg( os );
+                        CodeGenerator cg( os );
                         dimension->accept( cg );
                 } // if
@@ -148 +148 @@
                         } // if
                 } else {
-                        CodeGenerator2 cg( os );
+                        CodeGenerator cg( os );
                         os << "(" ;
 

src/CodeGen/Generate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 23:39:24 2015
-// Update Count     : 1
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jun 02 11:08:44 2015
+// Update Count     : 4
 //
 
@@ -22 +22 @@
 #include "SynTree/Declaration.h"
 
-#include "CodeGenerator2.h"
+#include "CodeGenerator.h"
 
 using namespace std;
@@ -28 +28 @@
 namespace CodeGen {
         void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics ) {
-                CodeGen::CodeGenerator2 cgv( os );
+                CodeGen::CodeGenerator cgv( os );
 
                 for ( std::list<Declaration *>::iterator i = translationUnit.begin(); i != translationUnit.end();  i++ ) {
                         if ( LinkageSpec::isGeneratable( (*i)->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( (*i)->get_linkage() ) ) ) {
                                 (*i)->accept(cgv);
-                                cgv.shift_left();
                                 if ( doSemicolon( *i ) ) {
                                         os << ";";

src/CodeGen/module.mk

@@ -19 +19 @@
 
 SRC +=  CodeGen/Generate.cc \
-        CodeGen/CodeGenerator2.cc \
+        CodeGen/CodeGenerator.cc \
         CodeGen/GenType.cc \
         CodeGen/FixNames.cc \

src/Common/utility.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 15:34:57 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri May 29 16:17:02 2015
+// Update Count     : 7
 //
 
@@ -198 +198 @@
 }
 
+// it's nice to actually be able to increment iterators by an arbitrary amount
+template< typename Iterator >
+Iterator operator+(Iterator i, int inc) {
+        while ( inc > 0 ) {
+                ++i;
+                --inc;
+        }
+        return i;
+}
+
 #endif // _UTILITY_H
 

src/ControlStruct/ChooseMutator.cc

@@ -9 +9 @@
 // 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:31:39 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jun 03 15:30:20 2015
+// Update Count     : 5
 //
 
@@ -44 +44 @@
                 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;

src/ControlStruct/LabelFixer.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 27 16:16:14 2015
-// Update Count     : 4
+// Last Modified On : Tue Jun 02 15:30:32 2015
+// Update Count     : 93
 //
 
@@ -23 +23 @@
 #include "utility.h"
 
+#include <iostream>
+
 namespace ControlStruct {
-        LabelFixer::Entry::Entry( Statement *to, Statement *from ) : definition ( to ) {
+        LabelFixer::Entry::Entry( Statement *to, BranchStmt *from ) : definition ( to ) {
                 if ( from != 0 )
                         usage.push_back( from );
@@ -31 +33 @@
         bool LabelFixer::Entry::insideLoop() {
                 return ( dynamic_cast< ForStmt * > ( definition ) ||
-                                 dynamic_cast< WhileStmt * > ( definition )  );
+                        dynamic_cast< WhileStmt * > ( definition )  );
         }
 
@@ -46 +48 @@
         }
 
+        // prune to at most one label definition for each statement
         void LabelFixer::visit( Statement *stmt ) {
                 std::list< Label > &labels = stmt->get_labels();
 
                 if ( ! labels.empty() ) {
+                        // only remember one label for each statement
                         Label current = setLabelsDef( labels, stmt );
                         labels.clear();
@@ -57 +61 @@
 
         void LabelFixer::visit( BranchStmt *branchStmt ) {
-                visit ( ( Statement * )branchStmt );  // the labels this statement might have
+                visit ( ( Statement * )branchStmt );
 
-                Label target;
-                if ( (target = branchStmt->get_target()) != "" ) {
+                // for labeled branches, add an entry to the label table
+                Label target = branchStmt->get_target();
+                if ( target != "" ) {
                         setLabelsUsg( target, branchStmt );
-                } //else       /* computed goto or normal exit-loop statements */
+                }
         }
 
+        // sets the definition of the labelTable entry to be the provided 
+        // statement for every label in the list parameter. Happens for every kind of statement
         Label LabelFixer::setLabelsDef( std::list< Label > &llabel, Statement *definition ) {
                 assert( definition != 0 );
-                Entry *entry = new Entry( definition );
-                bool used = false;
+                assert( llabel.size() > 0 );
 
-                for ( std::list< Label >::iterator i = llabel.begin(); i != llabel.end(); i++ )
-                        if ( labelTable.find( *i ) == labelTable.end() )
-                                { used = true; labelTable[ *i ] = entry; } // undefined and unused
-                        else
-                                if ( labelTable[ *i ]->defined() )
-                                        throw SemanticError( "Duplicate definition of label: " + *i );
-                                else
-                                        labelTable[ *i ]->set_definition( definition );
+                Entry * e = new Entry( definition );
 
-                if ( ! used ) delete entry;
+                for ( std::list< Label >::iterator i = llabel.begin(); i != llabel.end(); i++ ) {
+                        if ( labelTable.find( *i ) == labelTable.end() ) {
+                                // all labels on this statement need to use the same entry, so this should only be created once
+                                // undefined and unused until now, add an entry
+                                labelTable[ *i ] =  e;
+                        } else if ( labelTable[ *i ]->defined() ) {
+                                // defined twice, error
+                                throw SemanticError( "Duplicate definition of label: " + *i );
+                        }       else {
+                                // used previously, but undefined until now -> link with this entry
+                                Entry * oldEntry = labelTable[ *i ];
+                                e->add_uses( oldEntry->get_uses() );
+                                labelTable[ *i ] = e;
+                        } // if
+                } // for
 
-                return labelTable[ llabel.front() ]->get_label();  // this *must* exist
+                // produce one of the labels attached to this statement to be 
+                // temporarily used as the canonical label
+                return labelTable[ llabel.front() ]->get_label();
         }
 
-        Label LabelFixer::setLabelsUsg( Label orgValue, Statement *use ) {
+        // Remember all uses of a label.
+        void LabelFixer::setLabelsUsg( Label orgValue, BranchStmt *use ) {
                 assert( use != 0 );
 
-                if ( labelTable.find( orgValue ) != labelTable.end() )
-                        labelTable[ orgValue ]->add_use( use );         // the label has been defined or used before
-                else
+                if ( labelTable.find( orgValue ) != labelTable.end() ) {
+                        // the label has been defined or used before
+                        labelTable[ orgValue ]->add_use( use );
+                } else {
                         labelTable[ orgValue ] = new Entry( 0, use );
-
-                return labelTable[ orgValue ]->get_label();
+                }
         }
 
+        // Ultimately builds a table that maps a label to its defining statement.
+        // In the process, 
         std::map<Label, Statement * > *LabelFixer::resolveJumps() throw ( SemanticError ) {
                 std::map< Statement *, Entry * > def_us;
 
-                for ( std::map< Label, Entry *>::iterator i = labelTable.begin(); i != labelTable.end(); i++ ) {
+                // combine the entries for all labels that target the same location
+                for ( std::map< Label, Entry *>::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) {
                         Entry *e = i->second;
 
                         if ( def_us.find ( e->get_definition() ) == def_us.end() ) {
                                 def_us[ e->get_definition() ] = e;                              
-                        } else {
-                                if ( e->used() )
-                                        def_us[ e->get_definition() ]->add_uses( e->get_uses() );
+                        } else if ( e->used() ) {
+                                def_us[ e->get_definition() ]->add_uses( e->get_uses() );
                         }
                 }
 
-                // get rid of labelTable
-                for ( std::map< Statement *, Entry * >::iterator i = def_us.begin(); i != def_us.end(); i++ ) {
+                // create a unique label for each target location. 
+                for ( std::map< Statement *, Entry * >::iterator i = def_us.begin(); i != def_us.end(); ++i ) {
                         Statement *to = (*i).first;
-                        std::list< Statement *> &from = (*i).second->get_uses();
-                        Label finalLabel = generator->newLabel();
-                        (*i).second->set_label( finalLabel );
+                        Entry * entry = (*i).second;
+                        std::list< BranchStmt *> &from = entry->get_uses();
 
+                        // no label definition found
                         if ( to == 0 ) {
-                                BranchStmt *first_use = dynamic_cast<BranchStmt *>(from.back());
-                                Label undef("");
-                                if ( first_use != 0 )
-                                        undef = first_use->get_target();
+                                Label undef = from.back()->get_target();
                                 throw SemanticError ( "'" + undef + "' label not defined");
                         }
+
+                        // generate a new label, and attach it to its defining statement
+                        // as the only label on that statement
+                        Label finalLabel = generator->newLabel();
+                        entry->set_label( finalLabel );
 
                         to->get_labels().clear();
                         to->get_labels().push_back( finalLabel );
 
-                        for ( std::list< Statement *>::iterator j = from.begin(); j != from.end(); j++ ) {
-                                BranchStmt *jumpTo = dynamic_cast< BranchStmt * > ( *j );
-                                assert( jumpTo != 0 );
-                                jumpTo->set_target( finalLabel );
+                        // redirect each of the source branch statements to the new target label
+                        for ( std::list< BranchStmt *>::iterator j = from.begin(); j != from.end(); ++j ) {
+                                BranchStmt *jump = *j;
+                                assert( jump != 0 );
+                                jump->set_target( finalLabel );
                         } // for
                 } // for
 
-                // reverse table
+                // create a table where each label maps to its defining statement
                 std::map< Label, Statement * > *ret = new std::map< Label, Statement * >();
-                for ( std::map< Statement *, Entry * >::iterator i = def_us.begin(); i != def_us.end(); i++ ) 
+                for ( std::map< Statement *, Entry * >::iterator i = def_us.begin(); i != def_us.end(); ++i ) {
                         (*ret)[ (*i).second->get_label() ] = (*i).first;
+                }
 
                 return ret;

src/ControlStruct/LabelFixer.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue May 26 12:55:10 2015
-// Update Count     : 4
+// Last Modified On : Fri May 29 15:25:55 2015
+// Update Count     : 11
 //
 
@@ -55 +55 @@
 
                 Label setLabelsDef( std::list< Label > &, Statement *definition );
-                Label setLabelsUsg( Label, Statement *usage = 0 );
+                void setLabelsUsg( Label, BranchStmt *usage = 0 );
 
           private:
                 class Entry {
                   public:
-                        Entry( Statement *to = 0, Statement *from = 0 );
+                        Entry( Statement *to = 0, BranchStmt *from = 0 );
                         bool used() { return ( usage.empty() ); }
                         bool defined() { return ( definition != 0 ); }
@@ -71 +71 @@
                         void set_definition( Statement *def ) { definition = def; }
 
-                        std::list< Statement *> &get_uses() { return usage; }
-                        void add_use ( Statement *use ) { usage.push_back( use ); }
-                        void add_uses ( std::list<Statement *> uses ) { usage.insert( usage.end(), uses.begin(), uses.end() ); }
+                        std::list< BranchStmt *> &get_uses() { return usage; }
+                        void add_use ( BranchStmt *use ) { usage.push_back( use ); }
+                        void add_uses ( std::list<BranchStmt *> uses ) { usage.insert( usage.end(), uses.begin(), uses.end() ); }
                   private:
                         Label label;  
                         Statement *definition;
-                        std::list<Statement *> usage;
+                        std::list<BranchStmt *> usage;
                 };
                   

src/ControlStruct/LabelGenerator.cc

@@ -9 +9 @@
 // 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:32:04 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jun 03 14:23:26 2015
+// Update Count     : 9
 //
 
@@ -29 +29 @@
         }
 
-        Label LabelGenerator::newLabel() {
+        Label LabelGenerator::newLabel(std::string suffix) {
                 std::ostrstream os;
-                os << "__L" << current++ << "__";// << std::ends;
+                os << "__L" << current++ << "__" << suffix;
                 os.freeze( false );
                 std::string ret = std::string (os.str(), os.pcount());

src/ControlStruct/LabelGenerator.h

@@ -9 +9 @@
 // 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:20 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jun 03 14:16:26 2015
+// Update Count     : 5
 //
 
@@ -18 +18 @@
 
 #include "SynTree/SynTree.h"
+#include <string>
 
 namespace ControlStruct {
@@ -23 +24 @@
           public:
                 static LabelGenerator *getGenerator();
-                Label newLabel();
+                Label newLabel(std::string suffix = "");
                 void reset() { current = 0; }
                 void rewind() { current--; }

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 27 16:19:32 2015
-// Update Count     : 44
+// Last Modified On : Wed Jun 03 15:09:27 2015
+// Update Count     : 170
 //
 
@@ -19 +19 @@
 #include "MLEMutator.h"
 #include "SynTree/Statement.h"
+#include "SynTree/Expression.h"
 
 namespace ControlStruct {
@@ -26 +27 @@
         }
 
-        CompoundStmt* MLEMutator::mutate( CompoundStmt *cmpndStmt ) {
-                bool labeledBlock = false;
-                if ( !(cmpndStmt->get_labels().empty()) ) {
-                        labeledBlock = true;
-                        enclosingBlocks.push_back( Entry( cmpndStmt ) );
-                } // if
-
-                std::list< Statement * > &kids = cmpndStmt->get_kids();
+        // break labels have to come after the statement they break out of, 
+        // so mutate a statement, then if they inform us through the breakLabel field
+        // tha they need a place to jump to on a break statement, add the break label 
+        // to the body of statements
+        void MLEMutator::fixBlock( std::list< Statement * > &kids ) {
                 for ( std::list< Statement * >::iterator k = kids.begin(); k != kids.end(); k++ ) {
                         *k = (*k)->acceptMutator(*this);
 
                         if ( ! get_breakLabel().empty() ) {
-                                std::list< Statement * >::iterator next = k; next++;
+                                std::list< Statement * >::iterator next = k+1;
                                 if ( next == kids.end() ) {
                                         std::list<Label> ls; ls.push_back( get_breakLabel() );
@@ -49 +47 @@
                         } // if
                 } // for
+        }
+
+        CompoundStmt* MLEMutator::mutate( CompoundStmt *cmpndStmt ) {
+                bool labeledBlock = !(cmpndStmt->get_labels().empty());
+                if ( labeledBlock ) {
+                        Label brkLabel = generator->newLabel();
+                        enclosingBlocks.push_back( Entry( cmpndStmt, brkLabel ) );
+                } // if
+
+                // a child statement may set the break label
+                // - if they do, attach it to the next statement
+                std::list< Statement * > &kids = cmpndStmt->get_kids();
+                fixBlock( kids );
 
                 if ( labeledBlock ) {
                         assert( ! enclosingBlocks.empty() );
-                        if ( ! enclosingBlocks.back().get_breakExit().empty() ) {
-                                set_breakLabel( enclosingBlocks.back().get_breakExit() );
+                        if ( ! enclosingBlocks.back().useBreakExit().empty() ) {
+                                set_breakLabel( enclosingBlocks.back().useBreakExit() );
                         }
                         enclosingBlocks.pop_back();
                 } // if
 
-                //mutateAll( cmpndStmt->get_kids(), *this );
                 return cmpndStmt;
         }
 
-        Statement *MLEMutator::mutate( WhileStmt *whileStmt ) {
-                enclosingLoops.push_back( Entry( whileStmt ) );
-                whileStmt->set_body ( whileStmt->get_body()->acceptMutator( *this ) );
-
+        template< typename LoopClass >
+        Statement *MLEMutator::handleLoopStmt( LoopClass *loopStmt ) {
+                // remember this as the most recent enclosing loop, then mutate 
+                // the body of the loop -- this will do SOMETHING with branch statements
+                // and will recursively do the same to nested loops
+                Label brkLabel = generator->newLabel("loopBreak");
+                Label contLabel = generator->newLabel("loopContinue");
+                enclosingLoops.push_back( Entry( loopStmt, brkLabel, contLabel ) );
+                loopStmt->set_body ( loopStmt->get_body()->acceptMutator( *this ) );
+
+                // sanity check that the enclosing loops have been popped correctly
                 Entry &e = enclosingLoops.back();
-                assert ( e == whileStmt );
-                whileStmt->set_body( mutateLoop( whileStmt->get_body(), e ) );
+                assert ( e == loopStmt );
+
+                // generate labels as needed
+                loopStmt->set_body( mutateLoop( loopStmt->get_body(), e ) );
                 enclosingLoops.pop_back();
 
-                return whileStmt;
-        }
-
-        Statement *MLEMutator::mutate( ForStmt *forStmt ) {
-                enclosingLoops.push_back( Entry( forStmt ) );
-                maybeMutate( forStmt->get_body(), *this );
-
-                Entry &e = enclosingLoops.back();
-                assert ( e == forStmt );
-                forStmt->set_body( mutateLoop( forStmt->get_body(), e ) );
-                enclosingLoops.pop_back();
-
-                return forStmt;
+                return loopStmt;
+        }
+
+        Statement *MLEMutator::mutate( CaseStmt *caseStmt ) {
+                caseStmt->set_condition( maybeMutate( caseStmt->get_condition(), *this ) );
+                fixBlock( caseStmt->get_statements() );
+
+                return caseStmt;
+        }
+
+        template< typename SwitchClass >
+        Statement *MLEMutator::handleSwitchStmt( SwitchClass *switchStmt ) {
+                // generate a label for breaking out of a labeled switch 
+                Label brkLabel = generator->newLabel("switchBreak");
+                enclosingSwitches.push_back( Entry(switchStmt, brkLabel) );
+                mutateAll( switchStmt->get_branches(), *this ); 
+
+                Entry &e = enclosingSwitches.back();
+                assert ( e == switchStmt );
+
+                // only generate break label if labeled break is used
+                if (e.isBreakUsed()) {
+                        // for the purposes of keeping switch statements uniform (i.e. all statements that are 
+                        // direct children of a 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 ( CaseStmt * c = dynamic_cast< CaseStmt * >( branches.back() ) ) {
+                                std::list<Label> temp; temp.push_back( brkLabel );
+                                c->get_statements().push_back( new BranchStmt( temp, Label(""), BranchStmt::Break ) );
+                        } else assert(0); // as of this point, all branches of a switch are still CaseStmts
+                }
+
+                assert ( enclosingSwitches.back() == switchStmt );
+                enclosingSwitches.pop_back();
+                return switchStmt;
         }
 
@@ -117 +162 @@
                                         throw SemanticError("The target specified in the exit loop statement does not correspond to an enclosing control structure: " + originalTarget );
 
+                // what about exiting innermost block or switch???
                 if ( enclosingLoops.back() == (*check) )
                         return branchStmt;                              // exit the innermost loop (labels unnecessary)
 
-                Label newLabel;
+                // branch error checks, get the appropriate label name and create a goto
+                Label exitLabel;
                 switch ( branchStmt->get_type() ) {
                   case BranchStmt::Break:
-                                if ( check->get_breakExit() != "" ) {
-                                        newLabel = check->get_breakExit();
-                                } else {
-                                        newLabel = generator->newLabel();
-                                        check->set_breakExit( newLabel );
-                                } // if
+                                assert( check->useBreakExit() != "");
+                                exitLabel = check->useBreakExit();
                                 break;
                   case BranchStmt::Continue:
-                                if ( check->get_contExit() != "" ) {
-                                        newLabel = check->get_contExit();
-                                } else {
-                                        newLabel = generator->newLabel();
-                                        check->set_contExit( newLabel );
-                                } // if
+                                assert( check->useContExit() != "");
+                                exitLabel = check->useContExit();
                                 break;
                   default:
-                                return 0;                                       // shouldn't be here
+                                assert(0);                                      // shouldn't be here
                 } // switch
 
-                return new BranchStmt( std::list<Label>(), newLabel, BranchStmt::Goto );
-        }
-
-        template< typename SwitchClass >
-        Statement *handleSwitchStmt( SwitchClass *switchStmt, MLEMutator &mutator ) {
-                // set up some aliases so that the rest of the code isn't messy
-                typedef MLEMutator::Entry Entry;
-                LabelGenerator *generator = mutator.generator;
-                std::list< Entry > &enclosingSwitches = mutator.enclosingSwitches;
-
-                Label brkLabel = generator->newLabel();
-                enclosingSwitches.push_back( Entry(switchStmt, "", brkLabel) );
-                mutateAll( switchStmt->get_branches(), mutator ); {
-                        // check if this is necessary (if there is a break to this point, otherwise do not generate
-                        std::list<Label> temp; temp.push_back( brkLabel );
-                        switchStmt->get_branches().push_back( new BranchStmt( temp, Label(""), BranchStmt::Break ) );
-                }
-                assert ( enclosingSwitches.back() == switchStmt );
-                enclosingSwitches.pop_back();
-                return switchStmt;
-        }
-
-        Statement *MLEMutator::mutate( SwitchStmt *switchStmt ) {
-                return handleSwitchStmt( switchStmt, *this );
-        }
-
-        Statement *MLEMutator::mutate( ChooseStmt *switchStmt ) {
-                return handleSwitchStmt( switchStmt, *this );           
+                return new BranchStmt( std::list<Label>(), exitLabel, BranchStmt::Goto );
         }
 
         Statement *MLEMutator::mutateLoop( Statement *bodyLoop, Entry &e ) {
+                // ensure loop body is a block
                 CompoundStmt *newBody;
                 if ( ! (newBody = dynamic_cast<CompoundStmt *>( bodyLoop )) ) {
@@ -179 +192 @@
                 } // if
 
-                Label endLabel = e.get_contExit();
-
-                if ( e.get_breakExit() != "" ) {
-                        if ( endLabel == "" ) endLabel = generator->newLabel();
-                        // check for whether this label is used or not, so as to not generate extraneous gotos
-                        if (e.breakExitUsed)
-                                newBody->get_kids().push_back( new BranchStmt( std::list< Label >(), endLabel, BranchStmt::Goto ) );
-                        // xxx
-                        //std::list< Label > ls; ls.push_back( e.get_breakExit() );
-                        set_breakLabel( e.get_breakExit() );
-                        //newBody->get_kids().push_back( new BranchStmt( ls, "", BranchStmt::Break ) );
-                } // if
-
-                if ( e.get_breakExit() != "" || e.get_contExit() != "" ) {
-                        if (dynamic_cast< NullStmt *>( newBody->get_kids().back() ))
-                                newBody->get_kids().back()->get_labels().push_back( endLabel );
-                        else {
-                                std::list < Label > ls; ls.push_back( endLabel );
-                                newBody->get_kids().push_back( new NullStmt( ls ) );
-                        } // if
-                } // if
+                // only generate these when needed
+
+                if ( e.isContUsed() ) {
+                        // continue label goes in the body as the last statement
+                        std::list< Label > labels; labels.push_back( e.useContExit() );
+                        newBody->get_kids().push_back( new NullStmt( labels ) );                        
+                }
+
+                if ( e.isBreakUsed() ) {
+                        // break label goes after the loop -- it'll get set by the 
+                        // outer mutator if we do this
+                        set_breakLabel( e.useBreakExit() );                     
+                }
 
                 return newBody;
         }
 
-        //*** Entry's methods
-        void MLEMutator::Entry::set_contExit( Label l ) {
-                assert ( contExit == "" || contExit == l );
-                contExit = l;
-        }
-
-        void MLEMutator::Entry::set_breakExit( Label l ) {
-                assert ( breakExit == "" || breakExit == l );
-                breakExit = l;
-        }
+        Statement *MLEMutator::mutate( WhileStmt *whileStmt ) {
+                return handleLoopStmt( whileStmt );
+        }
+
+        Statement *MLEMutator::mutate( ForStmt *forStmt ) {
+                return handleLoopStmt( forStmt );
+        }
+
+        Statement *MLEMutator::mutate( SwitchStmt *switchStmt ) {
+                return handleSwitchStmt( switchStmt );
+        }
+
+        Statement *MLEMutator::mutate( ChooseStmt *switchStmt ) {
+                return handleSwitchStmt( switchStmt );          
+        }
+
 } // namespace ControlStruct
 

src/ControlStruct/MLEMutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue May 26 15:04:21 2015
-// Update Count     : 7
+// Last Modified On : Wed Jun 03 15:06:36 2015
+// Update Count     : 25
 //
 
@@ -38 +38 @@
                 Statement *mutate( BranchStmt *branchStmt ) throw ( SemanticError );
 
+                Statement *mutate( CaseStmt *caseStmt ); 
                 Statement *mutate( SwitchStmt *switchStmt );
                 Statement *mutate( ChooseStmt *switchStmt );
@@ -48 +49 @@
                 class Entry {
                   public:
-                        explicit Entry( Statement *_loop = 0, Label _contExit = Label(""), Label _breakExit = Label("") ) :
-                                loop( _loop ), contExit( _contExit ), breakExit( _breakExit ), contExitUsed( false ), breakExitUsed( false ) {}
+                        explicit Entry( Statement *_loop, Label _breakExit, Label _contExit = Label("") ) :
+                                loop( _loop ), breakExit( _breakExit ), contExit( _contExit ), breakUsed(false), contUsed(false) {}
 
                         bool operator==( const Statement *stmt ) { return ( loop == stmt ); }
@@ -58 +59 @@
                         Statement *get_loop() const { return loop; }
 
-                        Label get_contExit() const { return contExit; }
-                        void set_contExit( Label );
+                        Label useContExit() { contUsed = true; return contExit; }
+                        Label useBreakExit() { breakUsed = true; return breakExit; }
 
-                        Label get_breakExit() const { return breakExit; }
-                        void set_breakExit( Label );
+                        bool isContUsed() const { return contUsed; }
+                        bool isBreakUsed() const { return breakUsed; }
 
                   private:
                         Statement *loop;
-                        Label contExit, breakExit;
-                  public: // hack, provide proper [sg]etters
-                        bool contExitUsed, breakExitUsed;
+                        Label breakExit, contExit;
+                        bool breakUsed, contUsed;
                 };
 
@@ -76 +76 @@
                 LabelGenerator *generator;
 
+                template< typename LoopClass >
+                Statement *handleLoopStmt( LoopClass *loopStmt );
+
                 template< typename SwitchClass > 
-                friend Statement *handleSwitchStmt( SwitchClass *switchStmt, MLEMutator &mutator );
+                Statement *handleSwitchStmt( SwitchClass *switchStmt );
+
+                void fixBlock( std::list< Statement * > &kids );
         };
 } // namespace ControlStruct

src/ControlStruct/Mutate.cc

@@ -9 +9 @@
 // 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:32:52 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jun 03 23:08:43 2015
+// Update Count     : 5
 //
 
@@ -37 +37 @@
         void mutate( std::list< Declaration * > translationUnit ) {
                 // ForExprMutator formut;
+
+                // normalizes label definitions and generates multi-level
+                // exit labels
                 LabelFixer lfix;
+
+                // transform choose statements into switch statements
                 ChooseMutator chmut;
+
+                // expand case ranges and turn fallthru into a null statement
                 CaseRangeMutator ranges;  // has to run after ChooseMutator
+
                 //ExceptMutator exc;
                 // LabelTypeChecker lbl;

src/Makefile.in

@@ -98 +98 @@
 am__objects_1 = cfa_cpp-main.$(OBJEXT) cfa_cpp-MakeLibCfa.$(OBJEXT) \
         CodeGen/cfa_cpp-Generate.$(OBJEXT) \
-        CodeGen/cfa_cpp-CodeGenerator2.$(OBJEXT) \
+        CodeGen/cfa_cpp-CodeGenerator.$(OBJEXT) \
         CodeGen/cfa_cpp-GenType.$(OBJEXT) \
         CodeGen/cfa_cpp-FixNames.$(OBJEXT) \
@@ -335 +335 @@
 AUTOMAKE_OPTIONS = subdir-objects
 SRC = main.cc MakeLibCfa.cc CodeGen/Generate.cc \
-        CodeGen/CodeGenerator2.cc CodeGen/GenType.cc \
+        CodeGen/CodeGenerator.cc CodeGen/GenType.cc \
         CodeGen/FixNames.cc CodeGen/OperatorTable.cc \
         Common/SemanticError.cc Common/UniqueName.cc \
@@ -475 +475 @@
 CodeGen/cfa_cpp-Generate.$(OBJEXT): CodeGen/$(am__dirstamp) \
         CodeGen/$(DEPDIR)/$(am__dirstamp)
-CodeGen/cfa_cpp-CodeGenerator2.$(OBJEXT): CodeGen/$(am__dirstamp) \
+CodeGen/cfa_cpp-CodeGenerator.$(OBJEXT): CodeGen/$(am__dirstamp) \
         CodeGen/$(DEPDIR)/$(am__dirstamp)
 CodeGen/cfa_cpp-GenType.$(OBJEXT): CodeGen/$(am__dirstamp) \
@@ -760 +760 @@
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
-        -rm -f CodeGen/cfa_cpp-CodeGenerator2.$(OBJEXT)
+        -rm -f CodeGen/cfa_cpp-CodeGenerator.$(OBJEXT)
         -rm -f CodeGen/cfa_cpp-FixNames.$(OBJEXT)
         -rm -f CodeGen/cfa_cpp-GenType.$(OBJEXT)
@@ -868 +868 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfa_cpp-MakeLibCfa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfa_cpp-main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/cfa_cpp-FixNames.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/cfa_cpp-GenType.Po@am__quote@
@@ -1029 +1029 @@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o CodeGen/cfa_cpp-Generate.obj `if test -f 'CodeGen/Generate.cc'; then $(CYGPATH_W) 'CodeGen/Generate.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/Generate.cc'; fi`
 
-CodeGen/cfa_cpp-CodeGenerator2.o: CodeGen/CodeGenerator2.cc
-@am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeGen/cfa_cpp-CodeGenerator2.o -MD -MP -MF CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator2.Tpo -c -o CodeGen/cfa_cpp-CodeGenerator2.o `test -f 'CodeGen/CodeGenerator2.cc' || echo '$(srcdir)/'`CodeGen/CodeGenerator2.cc
-@am__fastdepCXX_TRUE@   $(am__mv) CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator2.Tpo CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator2.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='CodeGen/CodeGenerator2.cc' object='CodeGen/cfa_cpp-CodeGenerator2.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o CodeGen/cfa_cpp-CodeGenerator2.o `test -f 'CodeGen/CodeGenerator2.cc' || echo '$(srcdir)/'`CodeGen/CodeGenerator2.cc
-
-CodeGen/cfa_cpp-CodeGenerator2.obj: CodeGen/CodeGenerator2.cc
-@am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeGen/cfa_cpp-CodeGenerator2.obj -MD -MP -MF CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator2.Tpo -c -o CodeGen/cfa_cpp-CodeGenerator2.obj `if test -f 'CodeGen/CodeGenerator2.cc'; then $(CYGPATH_W) 'CodeGen/CodeGenerator2.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/CodeGenerator2.cc'; fi`
-@am__fastdepCXX_TRUE@   $(am__mv) CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator2.Tpo CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator2.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='CodeGen/CodeGenerator2.cc' object='CodeGen/cfa_cpp-CodeGenerator2.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o CodeGen/cfa_cpp-CodeGenerator2.obj `if test -f 'CodeGen/CodeGenerator2.cc'; then $(CYGPATH_W) 'CodeGen/CodeGenerator2.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/CodeGenerator2.cc'; fi`
+CodeGen/cfa_cpp-CodeGenerator.o: CodeGen/CodeGenerator.cc
+@am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeGen/cfa_cpp-CodeGenerator.o -MD -MP -MF CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator.Tpo -c -o CodeGen/cfa_cpp-CodeGenerator.o `test -f 'CodeGen/CodeGenerator.cc' || echo '$(srcdir)/'`CodeGen/CodeGenerator.cc
+@am__fastdepCXX_TRUE@   $(am__mv) CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator.Tpo CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='CodeGen/CodeGenerator.cc' object='CodeGen/cfa_cpp-CodeGenerator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o CodeGen/cfa_cpp-CodeGenerator.o `test -f 'CodeGen/CodeGenerator.cc' || echo '$(srcdir)/'`CodeGen/CodeGenerator.cc
+
+CodeGen/cfa_cpp-CodeGenerator.obj: CodeGen/CodeGenerator.cc
+@am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeGen/cfa_cpp-CodeGenerator.obj -MD -MP -MF CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator.Tpo -c -o CodeGen/cfa_cpp-CodeGenerator.obj `if test -f 'CodeGen/CodeGenerator.cc'; then $(CYGPATH_W) 'CodeGen/CodeGenerator.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/CodeGenerator.cc'; fi`
+@am__fastdepCXX_TRUE@   $(am__mv) CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator.Tpo CodeGen/$(DEPDIR)/cfa_cpp-CodeGenerator.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='CodeGen/CodeGenerator.cc' object='CodeGen/cfa_cpp-CodeGenerator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o CodeGen/cfa_cpp-CodeGenerator.obj `if test -f 'CodeGen/CodeGenerator.cc'; then $(CYGPATH_W) 'CodeGen/CodeGenerator.cc'; else $(CYGPATH_W) '$(srcdir)/CodeGen/CodeGenerator.cc'; fi`
 
 CodeGen/cfa_cpp-GenType.o: CodeGen/GenType.cc

src/SynTree/Mutator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 10:12:28 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri May 29 16:34:08 2015
+// Update Count     : 4
 //
 #include <cassert>
@@ -104 +104 @@
                 assert( newnode );
                 return newnode;
-///         return tree->acceptMutator( mutator );
         } else {
                 return 0;

src/SynTree/ObjectDecl.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 10:14:18 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu May 28 14:10:02 2015
+// Update Count     : 8
 //
 
@@ -65 +65 @@
 
 void ObjectDecl::printShort( std::ostream &os, int indent ) const {
+#if 0
+        if ( get_mangleName() != "") {
+                os << get_mangleName() << ": a "; 
+        } else 
+#endif
         if ( get_name() != "" ) {
                 os << get_name() << ": a ";

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 27 15:41:13 2015
-// Update Count     : 8
+// Last Modified On : Tue Jun 02 13:07:09 2015
+// Update Count     : 14
 //
 
@@ -124 +124 @@
 CaseStmt::~CaseStmt() {
         delete condition;
+}
+
+CaseStmt * CaseStmt::makeDefault( std::list<Label> labels, std::list<Statement *> branches ) {
+        return new CaseStmt( labels, 0, branches, true );
 }
 

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 27 15:40:43 2015
-// Update Count     : 5
+// Last Modified On : Tue Jun 02 13:07:25 2015
+// Update Count     : 13
 //
 
@@ -149 +149 @@
               std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
         virtual ~CaseStmt();
+
+        static CaseStmt * makeDefault( std::list<Label> labels = std::list<Label>(),
+                std::list<Statement *> stmts = std::list<Statement *>() );
 
         bool isDefault() { return _isDefault; }

src/examples/control_structures.c

@@ -18 +18 @@
                 L2: switch ( 3_333_333 ) {                                              // underscores in constant
                         case 1,2,3:                                                                     // 4~8, 4...8 not working
+                        case 4~8:
                                 L3: for ( ;; ) {
                                         L4: for ( ;; ) {