Changes in src/Common/PassVisitor.h [6ca154b:4eb31f2b]

File:

• src/Common/PassVisitor.h (modified) (10 diffs)

src/Common/PassVisitor.h

@@ -18 +18 @@
 // Templated visitor type
 // To use declare a PassVisitor< YOUR VISITOR TYPE >
-// The visitor type should specify the previsit/postvisit/premutate/postmutate for types that are desired.
-// Note: previsit/postvisit/premutate/postmutate must be **public** members
-//
-// Several additional features are available through inheritance
-// | WithTypeSubstitution - provides polymorphic TypeSubstitution * env for the current expression
-// | WithStmtsToAdd       - provides the ability to insert statements before or after the current statement by adding new statements into
-//                          stmtsToAddBefore or stmtsToAddAfter respectively.
-// | WithShortCircuiting  - provides the ability to skip visiting child nodes; set visit_children to false in pre{visit,mutate} to skip visiting children
-// | WithScopes           - provides the ability to save/restore data like a LIFO stack; to save, call GuardValue with the variable to save, the variable
-//                          will automatically be restored to its previous value after the corresponding postvisit/postmutate teminates.
+// The visitor type should specify the previsit/postvisit for types that are desired.
 //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 template< typename pass_type >
@@ -37 +28 @@
         PassVisitor(Args &&... args)
                 : pass( std::forward<Args>( args )... )
-        {
-                typedef PassVisitor<pass_type> this_t;
-                this_t * const * visitor = visitor_impl(pass, 0);
-                if(visitor) {
-                        *const_cast<this_t **>( visitor ) = this;
-                }
-        }
+        {}
 
         virtual ~PassVisitor() = default;
@@ -101 +86 @@
         virtual void visit( ConstructorExpr * ctorExpr ) override final;
         virtual void visit( CompoundLiteralExpr *compLitExpr ) override final;
+        virtual void visit( UntypedValofExpr *valofExpr ) override final;
         virtual void visit( RangeExpr *rangeExpr ) override final;
         virtual void visit( UntypedTupleExpr *tupleExpr ) override final;
@@ -186 +172 @@
         virtual Expression* mutate( ConstructorExpr *ctorExpr ) override final;
         virtual Expression* mutate( CompoundLiteralExpr *compLitExpr ) override final;
+        virtual Expression* mutate( UntypedValofExpr *valofExpr ) override final;
         virtual Expression* mutate( RangeExpr *rangeExpr ) override final;
         virtual Expression* mutate( UntypedTupleExpr *tupleExpr ) override final;
@@ -220 +207 @@
 
 private:
-        template<typename pass_t> friend void acceptAll( std::list< Declaration* > &decls, PassVisitor< pass_t >& visitor );
-        template<typename pass_t> friend void mutateAll( std::list< Declaration* > &decls, PassVisitor< pass_t >& visitor );
-
         template<typename node_type> void call_previsit ( node_type * node ) { previsit_impl ( pass, node, 0 ); }
         template<typename node_type> void call_postvisit( node_type * node ) { postvisit_impl( pass, node, 0 ); }
@@ -234 +218 @@
         void set_env( TypeSubstitution * env ) { set_env_impl( pass, env, 0); }
 
-        template< typename func_t >
-        void handleStatementList( std::list< Statement * > & statements, func_t func );
-        void visitStatementList ( std::list< Statement* > &statements );
+        void visitStatementList( std::list< Statement* > &statements );
         void mutateStatementList( std::list< Statement* > &statements );
 
-        template< typename func_t >
-        Statement * handleStatement( Statement * stmt, func_t func );
-        Statement * visitStatement ( Statement * stmt );
+        Statement * visitStatement( Statement * stmt );
         Statement * mutateStatement( Statement * stmt );
 
-        template< typename func_t >
-        Expression * handleExpression( Expression * expr, func_t func );
-        Expression * visitExpression ( Expression * expr );
+        void visitExpression( Expression * expr );
         Expression * mutateExpression( Expression * expr );
 
@@ -253 +231 @@
         std::list< Statement* > *       get_beforeStmts() { return stmtsToAddBefore_impl( pass, 0); }
         std::list< Statement* > *       get_afterStmts () { return stmtsToAddAfter_impl ( pass, 0); }
-        std::list< Declaration* > *     get_beforeDecls() { return declsToAddBefore_impl( pass, 0); }
-        std::list< Declaration* > *     get_afterDecls () { return declsToAddAfter_impl ( pass, 0); }
-
-        void set_visit_children( bool& ref ) { bool_ref * ptr = visit_children_impl(pass, 0); if(ptr) ptr->set( ref ); }
+        bool visit_children() { bool* skip = skip_children_impl(pass, 0); return ! (skip && *skip); }
+        void reset_visit() { bool* skip = skip_children_impl(pass, 0); if(skip) *skip = false; }
 
         guard_value_impl init_guard() {
@@ -295 +271 @@
         std::list< Statement* > stmtsToAddAfter;
 };
+
 class WithShortCircuiting {
 protected:
@@ -301 +278 @@
 
 public:
-        bool_ref visit_children;
+        bool skip_children;
 };
 
@@ -320 +297 @@
 };
 
-template<typename pass_type>
-class WithVisitorRef {
-protected:
-        WithVisitorRef() = default;
-        ~WithVisitorRef() = default;
-
-public:
-        PassVisitor<pass_type> * const visitor;
-};
 
 #include "PassVisitor.impl.h"