Changes in src/AST/Pass.hpp [90320ac:af746cc]

File:

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

src/AST/Pass.hpp

@@ -222 +222 @@
         const ast::Type *             visit( const ast::UnionInstType        * ) override final;
         const ast::Type *             visit( const ast::EnumInstType         * ) override final;
-        const ast::Type *             visit( const ast::EnumPosType          * ) override final;
+        const ast::Type *             visit( const ast::EnumAttrType         * ) override final;
         const ast::Type *             visit( const ast::TraitInstType        * ) override final;
         const ast::Type *             visit( const ast::TypeInstType         * ) override final;
@@ -252 +252 @@
 private:
 
-        /// The return type of the general call_accept function.
+        __pass::result1<ast::Stmt> call_accept( const ast::Stmt * );
+        __pass::result1<ast::Expr> call_accept( const ast::Expr * );
+
+        /// This has a `type` member that is the return type for the
+        /// generic call_accept if the generic call_accept is defined.
         template< typename node_t >
-        using call_accept_result_t = __pass::result1<
-                typename std::remove_pointer< typename std::result_of<
-                        decltype(&node_t::accept)(node_t*, type&) >::type >::type
+        using generic_call_accept_result =
+                std::enable_if<
+                                !std::is_base_of<ast::Expr, node_t>::value &&
+                                !std::is_base_of<ast::Stmt, node_t>::value
+                        , __pass::result1<
+                                typename std::remove_pointer< typename std::result_of<
+                                        decltype(&node_t::accept)(node_t*, type&) >::type >::type
+                        >
                 >;
 
         template< typename node_t >
-        auto call_accept( const node_t * node ) -> call_accept_result_t<node_t>;
+        auto call_accept( const node_t * node )
+                -> typename generic_call_accept_result<node_t>::type;
 
         // requests WithStmtsToAdd directly add to this statement, as if it is a compound.