Changes in src/InitTweak/GenInit.cc [4eb31f2b:8ca3a72]

File:

• src/InitTweak/GenInit.cc (modified) (5 diffs)

src/InitTweak/GenInit.cc

@@ -21 +21 @@
 
 #include "Common/PassVisitor.h"
+
+#include "GenPoly/DeclMutator.h"
+#include "GenPoly/PolyMutator.h"
+#include "GenPoly/ScopedSet.h"
+
+#include "ResolvExpr/typeops.h"
 
 #include "SynTree/Declaration.h"
@@ -32 +38 @@
 #include "SymTab/Mangler.h"
 
-#include "GenPoly/DeclMutator.h"
-#include "GenPoly/PolyMutator.h"
-#include "GenPoly/ScopedSet.h"
-
-#include "ResolvExpr/typeops.h"
-
 namespace InitTweak {
-        namespace {
-                const std::list<Label> noLabels;
-                const std::list<Expression *> noDesignators;
-        }
-
-        class ReturnFixer : public WithStmtsToAdd, public WithScopes {
+        class ReturnFixer final : public GenPoly::PolyMutator {
           public:
                 /// consistently allocates a temporary variable for the return value
@@ -51 +46 @@
                 static void makeReturnTemp( std::list< Declaration * > &translationUnit );
 
-                void premutate( FunctionDecl *functionDecl );
-                void premutate( ReturnStmt * returnStmt );
+                typedef GenPoly::PolyMutator Parent;
+                using Parent::mutate;
+                virtual DeclarationWithType * mutate( FunctionDecl *functionDecl ) override;
+                virtual Statement * mutate( ReturnStmt * returnStmt ) override;
 
           protected:
@@ -134 +131 @@
 
         void ReturnFixer::makeReturnTemp( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<ReturnFixer> fixer;
+                ReturnFixer fixer;
                 mutateAll( translationUnit, fixer );
         }
 
-        void ReturnFixer::premutate( ReturnStmt *returnStmt ) {
+        Statement *ReturnFixer::mutate( ReturnStmt *returnStmt ) {
                 std::list< DeclarationWithType * > & returnVals = ftype->get_returnVals();
                 assert( returnVals.size() == 0 || returnVals.size() == 1 );
@@ -149 +146 @@
                         construct->get_args().push_back( new AddressExpr( new VariableExpr( returnVals.front() ) ) );
                         construct->get_args().push_back( returnStmt->get_expr() );
-                        stmtsToAddBefore.push_back(new ExprStmt(noLabels, construct));
+                        stmtsToAdd.push_back(new ExprStmt(noLabels, construct));
 
                         // return the retVal object
                         returnStmt->set_expr( new VariableExpr( returnVals.front() ) );
                 } // if
-        }
-
-        void ReturnFixer::premutate( FunctionDecl *functionDecl ) {
-                GuardValue( ftype );
-                GuardValue( funcName );
+                return returnStmt;
+        }
+
+        DeclarationWithType* ReturnFixer::mutate( FunctionDecl *functionDecl ) {
+                ValueGuard< FunctionType * > oldFtype( ftype );
+                ValueGuard< std::string > oldFuncName( funcName );
 
                 ftype = functionDecl->get_functionType();
                 funcName = functionDecl->get_name();
+                return Parent::mutate( functionDecl );
         }