Changes in / [b1b3df5:3e1cd17]

Location:

src/AST

Files:

• Pass.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (10 diffs)
• Pass.proto.hpp (modified) (6 diffs)

src/AST/Pass.hpp

@@ -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.

src/AST/Pass.impl.hpp

@@ -109 +109 @@
                 return val;
         }
+
+        //------------------------------
+        /// Check if value was mutated, different for pointers and containers
+        template<typename lhs_t, typename rhs_t>
+        bool differs( const lhs_t * old_val, const rhs_t * new_val ) {
+                return old_val != new_val;
+        }
+
+        template< template <class...> class container_t, typename node_t >
+        bool differs( const container_t<ast::ptr< node_t >> &, const container_t<ast::ptr< node_t >> & new_val ) {
+                return !new_val.empty();
+        }
 }
 
@@ -114 +126 @@
 template< typename node_t >
 auto ast::Pass< core_t >::call_accept( const node_t * node ) ->
-                ast::Pass< core_t >::call_accept_result_t<node_t> {
+        typename ast::Pass< core_t >::template generic_call_accept_result<node_t>::type
+{
         __pedantic_pass_assert( __visit_children() );
         __pedantic_pass_assert( node );
 
+        static_assert( !std::is_base_of<ast::Expr, node_t>::value, "ERROR" );
+        static_assert( !std::is_base_of<ast::Stmt, node_t>::value, "ERROR" );
+
         auto nval = node->accept( *this );
-        return { nval != node, nval };
+        __pass::result1<
+                typename std::remove_pointer< decltype( node->accept(*this) ) >::type
+        > res;
+        res.differs = nval != node;
+        res.value = nval;
+        return res;
+}
+
+template< typename core_t >
+ast::__pass::template result1<ast::Expr> ast::Pass< core_t >::call_accept( const ast::Expr * expr ) {
+        __pedantic_pass_assert( __visit_children() );
+        __pedantic_pass_assert( expr );
+
+        auto nval = expr->accept( *this );
+        return { nval != expr, nval };
+}
+
+template< typename core_t >
+ast::__pass::template result1<ast::Stmt> ast::Pass< core_t >::call_accept( const ast::Stmt * stmt ) {
+        __pedantic_pass_assert( __visit_children() );
+        __pedantic_pass_assert( stmt );
+
+        const ast::Stmt * nval = stmt->accept( *this );
+        return { nval != stmt, nval };
 }
 
@@ -191 +230 @@
 ast::__pass::template resultNstmt<container_t> ast::Pass< core_t >::call_accept( const container_t< ptr<Stmt> > & statements ) {
         __pedantic_pass_assert( __visit_children() );
-        __pedantic_pass_assert( !statements.empty() );
+        if ( statements.empty() ) return {};
 
         // We are going to aggregate errors for all these statements
@@ -224 +263 @@
                         const ast::Stmt * new_stmt = stmt->accept( *this );
                         assert( new_stmt );
+                        if ( new_stmt != stmt ) { new_kids.differs = true; }
 
                         // Make sure that it is either adding statements or declartions but not both
@@ -236 +276 @@
                         // Now add the statement if there is one
                         if ( new_stmt != stmt ) {
-                                new_kids.differs = true;
-                                new_kids.values.emplace_back( new_stmt );
+                                new_kids.values.emplace_back( new_stmt, i, false );
                         } else {
-                                new_kids.values.emplace_back( i );
+                                new_kids.values.emplace_back( nullptr, i, true );
                         }
 
@@ -259 +298 @@
 ast::__pass::template resultN<container_t, node_t> ast::Pass< core_t >::call_accept( const container_t< ast::ptr<node_t> > & container ) {
         __pedantic_pass_assert( __visit_children() );
-        __pedantic_pass_assert( !container.empty() );
-
-        // Collect errors from processing all these nodes.
+        if ( container.empty() ) return {};
         SemanticErrorException errors;
 
@@ -305 +342 @@
         static_assert( !std::is_same<const ast::Node * &, decltype(old_val)>::value, "ERROR" );
 
-        auto result = call_accept( old_val );
-        if ( result.differs ) {
+        auto new_val = call_accept( old_val );
+
+        static_assert( !std::is_same<const ast::Node *, decltype(new_val)>::value /* || std::is_same<int, decltype(old_val)>::value */, "ERROR" );
+
+        if ( new_val.differs ) {
                 auto new_parent = __pass::mutate<core_t>(parent);
-                result.apply( new_parent, field );
+                new_val.apply(new_parent, field);
                 parent = new_parent;
         }
@@ -326 +366 @@
         static_assert( !std::is_same<const ast::Node * &, decltype(old_val)>::value, "ERROR" );
 
-        auto result = call_accept_top( old_val );
-        if ( result.differs ) {
+        auto new_val = call_accept_top( old_val );
+
+        static_assert( !std::is_same<const ast::Node *, decltype(new_val)>::value /* || std::is_same<int, decltype(old_val)>::value */, "ERROR" );
+
+        if ( new_val.differs ) {
                 auto new_parent = __pass::mutate<core_t>(parent);
-                result.apply( new_parent, field );
+                new_val.apply(new_parent, field);
                 parent = new_parent;
         }
@@ -347 +390 @@
         static_assert( !std::is_same<const ast::Node * &, decltype(old_val)>::value, "ERROR" );
 
-        auto result = call_accept_as_compound( old_val );
-        if ( result.differs ) {
+        auto new_val = call_accept_as_compound( old_val );
+
+        static_assert( !std::is_same<const ast::Node *, decltype(new_val)>::value || std::is_same<int, decltype(old_val)>::value, "ERROR" );
+
+        if ( new_val.differs ) {
                 auto new_parent = __pass::mutate<core_t>(parent);
-                result.apply( new_parent, child );
+                new_val.apply( new_parent, child );
                 parent = new_parent;
         }
@@ -406 +452 @@
 template< typename core_t >
 inline void ast::accept_all( ast::TranslationUnit & unit, ast::Pass< core_t > & visitor ) {
-        if ( auto ptr = __pass::translationUnit( visitor.core, 0 ) ) {
+        if ( auto ptr = __pass::translation_unit::get_cptr( visitor.core, 0 ) ) {
                 ValueGuard<const TranslationUnit *> guard( *ptr );
                 *ptr = &unit;

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();
@@ -257 +257 @@
         } else {
                 node = core.previsit( node );
-                assertf( node, "Previsit must not return nullptr." );
+                assertf(node, "Previsit must not return NULL");
         }
 }
@@ -310 +310 @@
 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 +506 @@
 } // 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 {