Changes in src/AST/Pass.proto.hpp [396b830:0e42794]

File:

• src/AST/Pass.proto.hpp (modified) (4 diffs)

src/AST/Pass.proto.hpp

@@ -263 +263 @@
                 template<typename pass_t>
                 static inline void leave( pass_t &, long ) {}
-        } // namespace scope
-
-        // Certain passes desire an up to date symbol table automatically
+        };
+
+        // Finally certain pass desire an up to date symbol table automatically
         // detect the presence of a member name `symtab` and call all the members appropriately
         namespace symtab {
                 // Some simple scoping rules
                 template<typename pass_t>
-                static inline auto enter( pass_t & pass, int ) -> decltype( pass.symtab, void() ) {
+                static inline auto enter( pass_t & pass, int ) -> decltype( pass.symtab.enterScope(), void() ) {
                         pass.symtab.enterScope();
                 }
@@ -278 +278 @@
 
                 template<typename pass_t>
-                static inline auto leave( pass_t & pass, int ) -> decltype( pass.symtab, void() ) {
+                static inline auto leave( pass_t & pass, int ) -> decltype( pass.symtab.leaveScope(), void() ) {
                         pass.symtab.leaveScope();
                 }
@@ -311 +311 @@
                 SYMTAB_FUNC1( addUnion  , const UnionDecl *     );
                 SYMTAB_FUNC1( addTrait  , const TraitDecl *     );
-                SYMTAB_FUNC2( addWith   , const std::vector< ptr<Expr> > &, const Decl * );
+                SYMTAB_FUNC2( addWith   , const std::vector< ptr<Expr> > &, const Node * );
 
                 // A few extra functions have more complicated behaviour, they are hand written
@@ -356 +356 @@
                 #undef SYMTAB_FUNC1
                 #undef SYMTAB_FUNC2
-        } // namespace symtab
-
-        // Some passes need to mutate TypeDecl and properly update their pointing TypeInstType.
-        // Detect the presence of a member name `subs` and call all members appropriately
-        namespace forall {
-                // Some simple scoping rules
-                template<typename pass_t>
-                static inline auto enter( pass_t & pass, int, const ast::ParameterizedType * type )
-                -> decltype( pass.subs, void() ) {
-                        if ( ! type->forall.empty() ) pass.subs.beginScope();
-                }
-
-                template<typename pass_t>
-                static inline auto enter( pass_t &, long, const ast::ParameterizedType * ) {}
-
-                template<typename pass_t>
-                static inline auto leave( pass_t & pass, int, const ast::ParameterizedType * type )
-                -> decltype( pass.subs, void() ) {
-                        if ( ! type->forall.empty() ) { pass.subs.endScope(); }
-                }
-
-                template<typename pass_t>
-                static inline auto leave( pass_t &, long, const ast::ParameterizedType * ) {}
-
-                // Get the substitution table, if present
-                template<typename pass_t>
-                static inline auto subs( pass_t & pass, int ) -> decltype( &pass.subs ) {
-                        return &pass.subs;
-                }
-
-                template<typename pass_t>
-                static inline ast::ForallSubstitutionTable * subs( pass_t &, long ) { return nullptr; }
-
-                // Replaces a TypeInstType's base TypeDecl according to the table
-                template<typename pass_t>
-                static inline auto replace( pass_t & pass, int, const ast::TypeInstType *& inst )
-                -> decltype( pass.subs, void() ) {
-                        inst = ast::mutate_field(
-                                inst, &ast::TypeInstType::base, pass.subs.replace( inst->base ) );
-                }
-
-                template<typename pass_t>
-                static inline auto replace( pass_t &, long, const ast::TypeInstType *& ) {}
-
-        } // namespace forall
-} // namespace __pass
-} // namespace ast
+        };
+};
+};