Changeset bb86117


Ignore:
Timestamp:
Jun 4, 2015, 10:55:52 PM (7 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, 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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/CodeGen/CodeGenerator.cc

    r0423f25 rbb86117  
    99// Author           : Richard C. Bilson
    1010// Created On       : Mon May 18 07:44:20 2015
    11 // Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Jun  4 14:05:45 2015
    13 // Update Count     : 120
     11// Last Modified By : Rob Schluntz
     12// Last Modified On : Thu Jun 04 15:00:00 2015
     13// Update Count     : 125
    1414//
    1515
     
    483483
    484484        void CodeGenerator::visit( SwitchStmt *switchStmt ) {
    485                 //output << /* "\r" << */ string( cur_indent, ' ' ) << CodeGenerator::printLabels( switchStmt->get_labels() )
    486485                output << "switch (" ;
    487486                switchStmt->get_condition()->accept(*this );
     
    500499        void CodeGenerator::visit( CaseStmt *caseStmt ) {
    501500                output << string( cur_indent, ' ' );
    502                 if ( caseStmt->isDefault())
     501                if ( caseStmt->isDefault()) {
    503502                        output << "default";
    504                 else {
     503                } else {
    505504                        output << "case ";
    506505                        caseStmt->get_condition()->accept(*this );
     
    512511                cur_indent += CodeGenerator::tabsize;
    513512                for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
    514                         output << /* "\r" << */ string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() )  ;
     513                        output << string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() )  ;
    515514                        (*i)->accept(*this );
    516515                        output << endl;
     
    520519
    521520        void CodeGenerator::visit( BranchStmt *branchStmt ) {
    522                 output << "\r" << string( cur_indent, ' ' );
    523                 output << CodeGenerator::printLabels( branchStmt->get_labels());
    524 
    525521                switch ( branchStmt->get_type()) {
    526522                  case BranchStmt::Goto:
     
    568564                whileStmt->get_body()->accept( *this );
    569565
    570                 output << /* "\r" << */ string( cur_indent, ' ' );
     566                output << string( cur_indent, ' ' );
    571567
    572568                if ( whileStmt->get_isDoWhile() ) {
     
    600596
    601597        void CodeGenerator::visit( NullStmt *nullStmt ) {
    602                 //output << /* "\r" << */ string( cur_indent, ' ' ) << CodeGenerator::printLabels( nullStmt->get_labels() );
     598                //output << string( cur_indent, ' ' ) << CodeGenerator::printLabels( nullStmt->get_labels() );
    603599                output << "/* null statement */ ;";
    604600        }
  • src/ControlStruct/MLEMutator.cc

    r0423f25 rbb86117  
    1010// Created On       : Mon May 18 07:44:20 2015
    1111// Last Modified By : Rob Schluntz
    12 // Last Modified On : Wed Jun 03 15:09:27 2015
    13 // Update Count     : 170
     12// Last Modified On : Thu Jun 04 15:12:33 2015
     13// Update Count     : 173
    1414//
    1515
     
    5252                bool labeledBlock = !(cmpndStmt->get_labels().empty());
    5353                if ( labeledBlock ) {
    54                         Label brkLabel = generator->newLabel();
     54                        Label brkLabel = generator->newLabel("blockBreak");
    5555                        enclosingBlocks.push_back( Entry( cmpndStmt, brkLabel ) );
    5656                } // if
     
    7575        Statement *MLEMutator::handleLoopStmt( LoopClass *loopStmt ) {
    7676                // remember this as the most recent enclosing loop, then mutate
    77                 // the body of the loop -- this will do SOMETHING with branch statements
     77                // the body of the loop -- this will determine whether brkLabel
     78                // and contLabel are used with branch statements
    7879                // and will recursively do the same to nested loops
    7980                Label brkLabel = generator->newLabel("loopBreak");
     
    8687                assert ( e == loopStmt );
    8788
    88                 // generate labels as needed
     89                // this will take the necessary steps to add definitions of the previous
     90                // two labels, if they are used.
    8991                loopStmt->set_body( mutateLoop( loopStmt->get_body(), e ) );
    9092                enclosingLoops.pop_back();
Note: See TracChangeset for help on using the changeset viewer.