Changes in src/GenPoly/DeclMutator.cc [dbd8652:b0b958a]

File:

• src/GenPoly/DeclMutator.cc (modified) (8 diffs)

src/GenPoly/DeclMutator.cc

@@ -24 +24 @@
         }
 
-        DeclMutator::DeclMutator() : Mutator(), declsToAdd(1), declsToAddAfter(1) {}
+        DeclMutator::DeclMutator() : Mutator(), declsToAdd(1) {}
 
         DeclMutator::~DeclMutator() {}
         
         void DeclMutator::mutateDeclarationList( std::list< Declaration* > &decls ) {
-                for ( std::list< Declaration* >::iterator decl = decls.begin(); ; ++decl ) {
-                        // splice in new declarations after previous decl
-                        decls.splice( decl, declsToAddAfter.back() );
-
-                        if ( decl == decls.end() ) break;
-                        
+                for ( std::list< Declaration* >::iterator decl = decls.begin(); decl != decls.end(); ++decl ) {
                         // run mutator on declaration
                         *decl = maybeMutate( *decl, *this );
@@ -44 +39 @@
 
         void DeclMutator::doBeginScope() {
-                // add new decl lists for inside of scope
+                // add new decl list for inside of scope
                 declsToAdd.resize( declsToAdd.size()+1 );
-                declsToAddAfter.resize( declsToAddAfter.size()+1 );
         }
 
@@ -55 +49 @@
                 newBack->splice( newBack->end(), *back );
                 declsToAdd.pop_back();
-                
-                back = declsToAddAfter.rbegin();
-                newBack = back + 1;
-                newBack->splice( newBack->end(), *back );
-                declsToAddAfter.pop_back();
         }
 
@@ -72 +61 @@
                 stmt = maybeMutate( stmt, *this );
                 // return if no declarations to add
-                if ( declsToAdd.back().empty() && declsToAddAfter.back().empty() ) {
-                        doEndScope();
-                        return stmt;
-                }
+                if ( declsToAdd.back().empty() ) return stmt;
 
                 // otherwise add declarations to new compound statement
@@ -85 +71 @@
                 declsToAdd.back().clear();
 
-                // add mutated statement
+                doEndScope();
+
+                // add mutated statement and return
                 compound->get_kids().push_back( stmt );
-
-                // add declarations after to new compound statement
-                for ( std::list< Declaration* >::iterator decl = declsToAddAfter.back().begin(); decl != declsToAddAfter.back().end(); ++decl ) {
-                        DeclStmt *declStmt = new DeclStmt( noLabels, *decl );
-                        compound->get_kids().push_back( declStmt );
-                }
-                declsToAddAfter.back().clear();
-
-                doEndScope();
                 return compound;
         }
@@ -101 +80 @@
         void DeclMutator::mutateStatementList( std::list< Statement* > &stmts ) {
                 doBeginScope();
-
                 
-                for ( std::list< Statement* >::iterator stmt = stmts.begin(); ; ++stmt ) {
-                        // add any new declarations after the previous statement
-                        for ( std::list< Declaration* >::iterator decl = declsToAddAfter.back().begin(); decl != declsToAddAfter.back().end(); ++decl ) {
-                                DeclStmt *declStmt = new DeclStmt( noLabels, *decl );
-                                stmts.insert( stmt, declStmt );
-                        }
-                        declsToAddAfter.back().clear();
-
-                        if ( stmt == stmts.end() ) break;
-                        
+                for ( std::list< Statement* >::iterator stmt = stmts.begin(); stmt != stmts.end(); ++stmt ) {
                         // run mutator on statement
                         *stmt = maybeMutate( *stmt, *this );
@@ -123 +92 @@
                         declsToAdd.back().clear();
                 }
-                
+
                 doEndScope();
         }
@@ -129 +98 @@
         void DeclMutator::addDeclaration( Declaration *decl ) {
                 declsToAdd.back().push_back( decl );
-        }
-
-        void DeclMutator::addDeclarationAfter( Declaration *decl ) {
-                declsToAddAfter.back().push_back( decl );
         }