Changes in src/GenPoly/FindFunction.cc [effdde0:08fc48f]

File:

• src/GenPoly/FindFunction.cc (modified) (6 diffs)

src/GenPoly/FindFunction.cc

@@ -18 +18 @@
 #include <utility>                      // for pair
 
-#include "Common/PassVisitor.h"         // for PassVisitor
 #include "Common/SemanticError.h"       // for SemanticError
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::iterator
@@ -28 +27 @@
 
 namespace GenPoly {
-        class FindFunction : public WithGuards, public WithVisitorRef<FindFunction>, public WithShortCircuiting {
+        class FindFunction : public Mutator {
           public:
                 FindFunction( std::list< FunctionType* > &functions, const TyVarMap &tyVars, bool replaceMode, FindFunctionPredicate predicate );
 
-                void premutate( FunctionType * functionType );
-                Type * postmutate( FunctionType * functionType );
-                void premutate( PointerType * pointerType );
+                virtual Type *mutate( FunctionType *functionType );
+                virtual Type *mutate( PointerType *pointerType );
           private:
                 void handleForall( const Type::ForallList &forall );
@@ -45 +43 @@
 
         void findFunction( Type *type, std::list< FunctionType* > &functions, const TyVarMap &tyVars, FindFunctionPredicate predicate ) {
-                PassVisitor<FindFunction> finder( functions, tyVars, false, predicate );
+                FindFunction finder( functions, tyVars, false, predicate );
                 type->acceptMutator( finder );
         }
 
         void findAndReplaceFunction( Type *&type, std::list< FunctionType* > &functions, const TyVarMap &tyVars, FindFunctionPredicate predicate ) {
-                PassVisitor<FindFunction> finder( functions, tyVars, true, predicate );
+                FindFunction finder( functions, tyVars, true, predicate );
                 type = type->acceptMutator( finder );
         }
@@ -59 +57 @@
 
         void FindFunction::handleForall( const Type::ForallList &forall ) {
-                for ( const Declaration * td : forall ) {
-                        TyVarMap::iterator var = tyVars.find( td->name );
+                for ( Type::ForallList::const_iterator i = forall.begin(); i != forall.end(); ++i ) {
+                        TyVarMap::iterator var = tyVars.find( (*i)->get_name() );
                         if ( var != tyVars.end() ) {
                                 tyVars.erase( var->first );
@@ -67 +65 @@
         }
 
-        void FindFunction::premutate( FunctionType * functionType ) {
-                visit_children = false;
-                GuardScope( tyVars );
+        Type * FindFunction::mutate( FunctionType *functionType ) {
+                tyVars.beginScope();
                 handleForall( functionType->get_forall() );
-                mutateAll( functionType->get_returnVals(), *visitor );
-        }
-
-        Type * FindFunction::postmutate( FunctionType * functionType ) {
+                mutateAll( functionType->get_returnVals(), *this );
                 Type *ret = functionType;
                 if ( predicate( functionType, tyVars ) ) {
@@ -83 +77 @@
                         } // if
                 } // if
+                tyVars.endScope();
                 return ret;
         }
 
-        void FindFunction::premutate( PointerType * pointerType ) {
-                GuardScope( tyVars );
+        Type * FindFunction::mutate( PointerType *pointerType ) {
+                tyVars.beginScope();
                 handleForall( pointerType->get_forall() );
+                Type *ret = Mutator::mutate( pointerType );
+                tyVars.endScope();
+                return ret;
         }
 } // namespace GenPoly