Changeset 1e9d87b

Timestamp:

Jan 7, 2016, 11:43:10 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

974906e2

Parents:

083cf31

Message:

made RemoveInit? a PolyMutator?

File:

• src/InitTweak/RemoveInit.cc (modified) (7 diffs)

src/InitTweak/RemoveInit.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// RemoveInit.cc -- 
+// RemoveInit.cc --
 //
 // Author           : Rob Schluntz
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 15 15:37:26 2015
-// Update Count     : 15
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Jan 07 11:34:33 2016
+// Update Count     : 23
 //
 
@@ -21 +21 @@
 #include "SynTree/Initializer.h"
 #include "SynTree/Mutator.h"
+#include "GenPoly/PolyMutator.h"
 
 namespace InitTweak {
@@ -26 +27 @@
                 const std::list<Label> noLabels;
         }
-        
-        class RemoveInit : public Mutator {
+
+        class RemoveInit : public GenPoly::PolyMutator {
           public:
                 RemoveInit();
@@ -34 +35 @@
 
                 virtual Statement * mutate( ReturnStmt * returnStmt );
-                
+
                 virtual CompoundStmt * mutate(CompoundStmt * compoundStmt);
-                
+
           protected:
-                std::list< Statement* > stmtsToAddBefore;
-                std::list< Statement* > stmtsToAddAfter;
-                void mutateStatementList( std::list< Statement* > &statements );
-
                 std::list<DeclarationWithType*> returnVals;
                 UniqueName tempNamer;
@@ -53 +50 @@
 
         RemoveInit::RemoveInit() : tempNamer( "_retVal" ) {}
-        
-        void RemoveInit::mutateStatementList( std::list< Statement* > &statements ) {
-                for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
-                        if ( ! stmtsToAddAfter.empty() ) {
-                                statements.splice( i, stmtsToAddAfter );
-                        } // if
-                        *i = (*i)->acceptMutator( *this );
-                        if ( ! stmtsToAddBefore.empty() ) {
-                                statements.splice( i, stmtsToAddBefore );
-                        } // if
-                } // for
-                if ( ! stmtsToAddAfter.empty() ) {
-                        statements.splice( statements.end(), stmtsToAddAfter );
-                } // if
-        }
 
         CompoundStmt *RemoveInit::mutate(CompoundStmt *compoundStmt) {
@@ -95 +77 @@
                 if ( returnStmt->get_expr() && returnVals.size() == 1 && funcName != "?=?" && ! returnVals.front()->get_type()->get_isLvalue()  ) {
                         ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, returnVals.front()->get_type()->clone(), 0 );
-                        stmtsToAddBefore.push_back( new DeclStmt( noLabels, newObj ) );
-                        
+                        stmtsToAdd.push_back( new DeclStmt( noLabels, newObj ) );
+
                         UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) );
                         assign->get_args().push_back( new AddressExpr (new NameExpr( newObj->get_name() ) ) );
                         assign->get_args().push_back( returnStmt->get_expr() );
-                        stmtsToAddBefore.push_back(new ExprStmt(noLabels, assign));
+                        stmtsToAdd.push_back(new ExprStmt(noLabels, assign));
 
                         returnStmt->set_expr( new VariableExpr( newObj ) );
@@ -110 +92 @@
                 std::list<DeclarationWithType*> oldReturnVals = returnVals;
                 std::string oldFuncName = funcName;
-                
+
                 FunctionType * type = functionDecl->get_functionType();
                 returnVals = type->get_returnVals();