Changes in src/AST/Pass.hpp [0240cd69:37cdd97]

File:

• src/AST/Pass.hpp (modified) (12 diffs)

src/AST/Pass.hpp

@@ -8 +8 @@
 //
 // Author           : Thierry Delisle
-// Created On       : Thu May 09 15:37:05 2019
+// Created On       : Thu May 09 15::37::05 2019
 // Last Modified By :
 // Last Modified On :
@@ -35 +35 @@
 #include "AST/SymbolTable.hpp"
 
-#include "AST/ForallSubstitutionTable.hpp"
-
 // Private prelude header, needed for some of the magic tricks this class pulls off
 #include "AST/Pass.proto.hpp"
@@ -48 +46 @@
 //
 // Several additional features are available through inheritance
-// | WithTypeSubstitution  - provides polymorphic const 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.
-// | WithDeclsToAdd        - provides the ability to insert declarations before or after the
-//                           current declarations by adding new DeclStmt into declsToAddBefore or
-//                           declsToAddAfter respectively.
-// | WithShortCircuiting   - provides the ability to skip visiting child nodes; set visit_children
-//                           to false in pre{visit,visit} to skip visiting children
-// | WithGuards            - 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.
-// | WithVisitorRef        - provides an pointer to the templated visitor wrapper
-// | WithSymbolTable       - provides symbol table functionality
-// | WithForallSubstitutor - maintains links between TypeInstType and TypeDecl under mutation
+// | WithTypeSubstitution - provides polymorphic const 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.
+// | WithDeclsToAdd       - provides the ability to insert declarations before or after the current
+//                          declarations by adding new DeclStmt into declsToAddBefore or
+//                          declsToAddAfter respectively.
+// | WithShortCircuiting  - provides the ability to skip visiting child nodes; set visit_children
+//                          to false in pre{visit,visit} to skip visiting children
+// | WithGuards           - 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.
+// | WithVisitorRef       - provides an pointer to the templated visitor wrapper
+// | WithSymbolTable      - provides symbol table functionality
 //-------------------------------------------------------------------------------------------------
-template< typename core_t >
+template< typename pass_t >
 class Pass final : public ast::Visitor {
 public:
-        using core_type = core_t;
-        using type = Pass<core_t>;
-
         /// Forward any arguments to the pass constructor
         /// Propagate 'this' if necessary
         template< typename... Args >
         Pass( Args &&... args)
-                : core( std::forward<Args>( args )... )
+                : pass( std::forward<Args>( args )... )
         {
                 // After the pass is constructed, check if it wants the have a pointer to the wrapping visitor
-                type * const * visitor = __pass::visitor(core, 0);
+                typedef Pass<pass_t> this_t;
+                this_t * const * visitor = __pass::visitor(pass, 0);
                 if(visitor) {
-                        *const_cast<type **>( visitor ) = this;
+                        *const_cast<this_t **>( visitor ) = this;
                 }
         }
@@ -87 +82 @@
         virtual ~Pass() = default;
 
-        /// Construct and run a pass on a translation unit.
-        template< typename... Args >
-        static void run( std::list< ptr<Decl> > & decls, Args &&... args ) {
-                Pass<core_t> visitor( std::forward<Args>( args )... );
-                accept_all( decls, visitor );
-        }
-
-        template< typename... Args >
-        static void run( std::list< ptr<Decl> > & decls ) {
-                Pass<core_t> visitor;
-                accept_all( decls, visitor );
-        }
-
         /// Storage for the actual pass
-        core_t core;
+        pass_t pass;
 
         /// Visit function declarations
@@ -197 +179 @@
         const ast::TypeSubstitution * visit( const ast::TypeSubstitution     * ) override final;
 
-        template<typename core_type>
-        friend void accept_all( std::list< ptr<Decl> > & decls, Pass<core_type>& visitor );
+        template<typename pass_type>
+        friend void accept_all( std::list< ptr<Decl> > & decls, Pass<pass_type>& visitor );
 private:
 
-        bool __visit_children() { __pass::bool_ref * ptr = __pass::visit_children(core, 0); return ptr ? *ptr : true; }
+        bool __visit_children() { __pass::bool_ref * ptr = __pass::visit_children(pass, 0); return ptr ? *ptr : true; }
 
 private:
@@ -220 +202 @@
         container_t< ptr<node_t> > call_accept( const container_t< ptr<node_t> > & container );
 
-        /// Mutate forall-list, accounting for presence of type substitution map
-        template<typename node_t>
-        void mutate_forall( const node_t *& );
-
 public:
         /// Logic to call the accept and mutate the parent if needed, delegates call to accept
@@ -232 +210 @@
         /// Internal RAII guard for symbol table features
         struct guard_symtab {
-                guard_symtab( Pass<core_t> & pass ): pass( pass ) { __pass::symtab::enter(pass.core, 0); }
-                ~guard_symtab()                                   { __pass::symtab::leave(pass.core, 0); }
-                Pass<core_t> & pass;
+                guard_symtab( Pass<pass_t> & pass ): pass( pass ) { __pass::symtab::enter(pass, 0); }
+                ~guard_symtab()                                   { __pass::symtab::leave(pass, 0); }
+                Pass<pass_t> & pass;
         };
 
         /// Internal RAII guard for scope features
         struct guard_scope {
-                guard_scope( Pass<core_t> & pass ): pass( pass ) { __pass::scope::enter(pass.core, 0); }
-                ~guard_scope()                                   { __pass::scope::leave(pass.core, 0); }
-                Pass<core_t> & pass;
-        };
-
-        /// Internal RAII guard for forall substitutions
-        struct guard_forall_subs {
-                guard_forall_subs( Pass<core_t> & pass, const ParameterizedType * type )
-                : pass( pass ), type( type ) { __pass::forall::enter(pass.core, 0, type ); }
-                ~guard_forall_subs()         { __pass::forall::leave(pass.core, 0, type ); }
-                Pass<core_t> & pass;
-                const ParameterizedType * type;
+                guard_scope( Pass<pass_t> & pass ): pass( pass ) { __pass::scope::enter(pass, 0); }
+                ~guard_scope()                                   { __pass::scope::leave(pass, 0); }
+                Pass<pass_t> & pass;
         };
 
@@ -258 +227 @@
 
 /// Apply a pass to an entire translation unit
-template<typename core_t>
-void accept_all( std::list< ast::ptr<ast::Decl> > &, ast::Pass<core_t> & visitor );
+template<typename pass_t>
+void accept_all( std::list< ast::ptr<ast::Decl> > &, ast::Pass<pass_t> & visitor );
 
 //-------------------------------------------------------------------------------------------------
@@ -299 +268 @@
         };
 
-        template< typename core_t>
-        friend auto __pass::at_cleanup( core_t & core, int ) -> decltype( &core.at_cleanup );
+        template< typename pass_t>
+        friend auto __pass::at_cleanup( pass_t & pass, int ) -> decltype( &pass.at_cleanup );
 public:
 
@@ -336 +305 @@
 
 /// Used to get a pointer to the pass with its wrapped type
-template<typename core_t>
+template<typename pass_t>
 struct WithVisitorRef {
-        Pass<core_t> * const visitor = nullptr;
+        Pass<pass_t> * const visitor = nullptr;
 };
 
@@ -345 +314 @@
         SymbolTable symtab;
 };
-
-/// Use when the templated visitor needs to keep TypeInstType instances properly linked to TypeDecl
-struct WithForallSubstitutor {
-        ForallSubstitutionTable subs;
-};
-
 }
 
@@ -358 +321 @@
 extern struct PassVisitorStats {
         size_t depth = 0;
-        Stats::Counters::MaxCounter<double> * max;
-        Stats::Counters::AverageCounter<double> * avg;
+        Stats::Counters::MaxCounter<double> * max = nullptr;
+        Stats::Counters::AverageCounter<double> * avg = nullptr;
 } pass_visitor_stats;
 }