Changeset effdde0 for src

Timestamp:

Oct 2, 2017, 5:11:51 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

93fe7141

Parents:

d29fa5f

Message:

Convert FindFunction? to PassVisitor?

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