Changes in src/AST/Pass.proto.hpp [dff6452:b0abc8a0]

File:

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

src/AST/Pass.proto.hpp

@@ -107 +107 @@
                 bool     * m_prev;
                 bool_ref * m_ref;
-        };
-
-        template<typename pass_t, typename node_t>
-        struct is_valid_previsit {
-                using ret_t = decltype( ((pass_t*)nullptr)->previsit( (const node_t *)nullptr ) );
-
-                static constexpr bool value = std::is_void< ret_t >::value ||
-                        std::is_base_of<const node_t, typename std::remove_pointer<ret_t>::type >::value;
         };
 
@@ -135 +127 @@
         static inline auto previsit( pass_t & pass, const node_t * & node, int ) -> decltype( pass.previsit( node ), void() ) {
                 static_assert(
-                        is_valid_previsit<pass_t, node_t>::value,
-                        "Previsit may not change the type of the node. It must return its paremeter or void."
+                        std::is_base_of<const node_t, typename std::remove_pointer<decltype( pass.previsit( node ) )>::type >::value,
+                        "Previsit may not change the type of the node. Use postvisit instead."
                 );
-                if(std::is_void< decltype( pass.previsit(node) ) >::value) {
-                        pass.previsit( node );
-                } else {
-                        node = pass.previsit( node );
-                        assert(node);
-                }
+                node = pass.previsit( node );
+                assert(node);
         }
 
@@ -151 +139 @@
         // PostVisit : never mutates the passed pointer but may return a different node
         template<typename pass_t, typename node_t>
-        static inline auto postvisit( pass_t & pass, const node_t * node, int ) ->
-                decltype( pass.postvisit( node ), node->accept( *(Visitor*)nullptr ) )
-        {
+        static inline auto postvisit( pass_t & pass, const node_t * node, int ) -> decltype( pass.postvisit( node ), (const node_t *)nullptr ) {
                 return pass.postvisit( node );
         }