Changeset bb86117

Timestamp:

Jun 4, 2015, 10:55:52 PM (9 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, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

aa30dc0

Parents:

0423f25 (diff), eb3261f (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 plg2:software/cfa/cfa-cc

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (7 diffs)
• ControlStruct/MLEMutator.cc (modified) (4 diffs)

src/CodeGen/CodeGenerator.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 : Thu Jun  4 14:05:45 2015
-// Update Count     : 120
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Jun 04 15:00:00 2015
+// Update Count     : 125
 //
 
@@ -483 +483 @@
 
         void CodeGenerator::visit( SwitchStmt *switchStmt ) {
-                //output << /* "\r" << */ string( cur_indent, ' ' ) << CodeGenerator::printLabels( switchStmt->get_labels() ) 
                 output << "switch (" ;
                 switchStmt->get_condition()->accept(*this );
@@ -500 +499 @@
         void CodeGenerator::visit( CaseStmt *caseStmt ) {
                 output << string( cur_indent, ' ' );
-                if ( caseStmt->isDefault()) 
+                if ( caseStmt->isDefault()) {
                         output << "default";
-                else {
+                } else {
                         output << "case ";
                         caseStmt->get_condition()->accept(*this );
@@ -512 +511 @@
                 cur_indent += CodeGenerator::tabsize;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
-                        output << /* "\r" << */ string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() )  ;
+                        output << string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() )  ;
                         (*i)->accept(*this );
                         output << endl;
@@ -520 +519 @@
 
         void CodeGenerator::visit( BranchStmt *branchStmt ) {
-                output << "\r" << string( cur_indent, ' ' );
-                output << CodeGenerator::printLabels( branchStmt->get_labels());
-
                 switch ( branchStmt->get_type()) {
                   case BranchStmt::Goto:
@@ -568 +564 @@
                 whileStmt->get_body()->accept( *this );
 
-                output << /* "\r" << */ string( cur_indent, ' ' );
+                output << string( cur_indent, ' ' );
 
                 if ( whileStmt->get_isDoWhile() ) {
@@ -600 +596 @@
 
         void CodeGenerator::visit( NullStmt *nullStmt ) {
-                //output << /* "\r" << */ string( cur_indent, ' ' ) << CodeGenerator::printLabels( nullStmt->get_labels() );
+                //output << string( cur_indent, ' ' ) << CodeGenerator::printLabels( nullStmt->get_labels() );
                 output << "/* null statement */ ;";
         }

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 03 15:09:27 2015
-// Update Count     : 170
+// Last Modified On : Thu Jun 04 15:12:33 2015
+// Update Count     : 173
 //
 
@@ -52 +52 @@
                 bool labeledBlock = !(cmpndStmt->get_labels().empty());
                 if ( labeledBlock ) {
-                        Label brkLabel = generator->newLabel();
+                        Label brkLabel = generator->newLabel("blockBreak");
                         enclosingBlocks.push_back( Entry( cmpndStmt, brkLabel ) );
                 } // if
@@ -75 +75 @@
         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
+                // the body of the loop -- this will determine whether brkLabel
+                // and contLabel are used with branch statements
                 // and will recursively do the same to nested loops
                 Label brkLabel = generator->newLabel("loopBreak");
@@ -86 +87 @@
                 assert ( e == loopStmt );
 
-                // generate labels as needed
+                // this will take the necessary steps to add definitions of the previous
+                // two labels, if they are used.
                 loopStmt->set_body( mutateLoop( loopStmt->get_body(), e ) );
                 enclosingLoops.pop_back();