Changes in src/AST/Pass.proto.hpp [7a36848:5bf685f]

File:

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

src/AST/Pass.proto.hpp

@@ -154 +154 @@
                 bool is_old;
 
-                explicit delta(const Stmt * s) : new_val(s), old_idx(-1), is_old(false) {}
-                explicit delta(ssize_t i) : new_val(nullptr), old_idx(i), is_old(true) {}
+                delta(const Stmt * s, ssize_t i, bool old) :
+                        new_val(s), old_idx(i), is_old(old) {}
         };
 
@@ -188 +188 @@
                 std::transform( stmts->begin(), stmts->end(), std::back_inserter( values ),
                         [](ast::ptr<ast::Stmt>& stmt) -> delta {
-                                return delta( stmt.release() );
+                                return delta( stmt.release(), -1, false );
                         });
                 stmts->clear();
@@ -201 +201 @@
                         [](ast::ptr<ast::Decl>& decl) -> delta {
                                 ast::Decl const * d = decl.release();
-                                return delta( new DeclStmt( d->location, d ) );
+                                return delta( new DeclStmt( d->location, d ), -1, false );
                         });
                 decls->clear();
@@ -226 +226 @@
                 // Now the original containers should still have the unchanged values
                 // but also contain the new values.
+        }
+};
+
+/// Used by previsit implementation
+/// We need to reassign the result to 'node', unless the function
+/// returns void, then we just leave 'node' unchanged
+template<bool is_void>
+struct __assign;
+
+template<>
+struct __assign<true> {
+        template<typename core_t, typename node_t>
+        static inline void result( core_t & core, const node_t * & node ) {
+                core.previsit( node );
+        }
+};
+
+template<>
+struct __assign<false> {
+        template<typename core_t, typename node_t>
+        static inline void result( core_t & core, const node_t * & node ) {
+                node = core.previsit( node );
+                assertf(node, "Previsit must not return NULL");
+        }
+};
+
+/// Used by postvisit implementation
+/// We need to return the result unless the function
+/// returns void, then we just return the original node
+template<bool is_void>
+struct __return;
+
+template<>
+struct __return<true> {
+        template<typename core_t, typename node_t>
+        static inline const node_t * result( core_t & core, const node_t * & node ) {
+                core.postvisit( node );
+                return node;
+        }
+};
+
+template<>
+struct __return<false> {
+        template<typename core_t, typename node_t>
+        static inline auto result( core_t & core, const node_t * & node ) {
+                return core.postvisit( node );
         }
 };
@@ -251 +297 @@
         );
 
-        // We need to reassign the result to 'node', unless the function
-        // returns void, then we just leave 'node' unchanged
-        if constexpr ( std::is_void_v<decltype( core.previsit( node ) )> ) {
-                core.previsit( node );
-        } else {
-                node = core.previsit( node );
-                assertf( node, "Previsit must not return nullptr." );
-        }
+        __assign<
+                std::is_void<
+                        decltype( core.previsit( node ) )
+                >::value
+        >::result( core, node );
 }
 
@@ -269 +312 @@
         decltype( core.postvisit( node ), node->accept( *(Visitor*)nullptr ) )
 {
-        // We need to return the result unless the function
-        // returns void, then we just return the original node
-        if constexpr ( std::is_void_v<decltype( core.postvisit( node ) )> ) {
-                core.postvisit( node );
-                return node;
-        } else {
-                return core.postvisit( node );
-        }
+        return __return<
+                std::is_void<
+                        decltype( core.postvisit( node ) )
+                >::value
+        >::result( core, node );
 }
 
@@ -310 +350 @@
 FIELD_PTR( at_cleanup, __pass::at_cleanup_t )
 FIELD_PTR( visitor, ast::Pass<core_t> * const )
-FIELD_PTR( translationUnit, const TranslationUnit * )
 
 // Remove the macro to make sure we don't clash
@@ -507 +546 @@
 } // namespace forall
 
+// For passes that need access to the global context. Searches `translationUnit`
+namespace translation_unit {
+        template<typename core_t>
+        static inline auto get_cptr( core_t & core, int )
+                        -> decltype( &core.translationUnit ) {
+                return &core.translationUnit;
+        }
+
+        template<typename core_t>
+        static inline const TranslationUnit ** get_cptr( core_t &, long ) {
+                return nullptr;
+        }
+}
+
 // For passes, usually utility passes, that have a result.
 namespace result {