Changeset 90320ac

Timestamp:

Apr 12, 2024, 3:10:04 PM (7 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

7a36848

Parents:

b78c54f

Message:

Clean-up in the Pass template around call_accept. Removed overloads that no longer contain unique behaviour. Redundent early exits have been removed. Updated the names and removed redundent checks following up the result* type update. New constructors for the delta helper type show how the data is actually used. The differs functions are unused (that value is stored in the result* types).

Location:

src/AST

Files:

• Pass.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (9 diffs)
• Pass.proto.hpp (modified) (3 diffs)

src/AST/Pass.hpp

@@ -252 +252 @@
 private:
 
-        __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.
+        /// The return type of the general call_accept function.
         template< typename node_t >
-        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
-                        >
+        using call_accept_result_t = __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 )
-                -> typename generic_call_accept_result<node_t>::type;
+        auto call_accept( const node_t * node ) -> call_accept_result_t<node_t>;
 
         // 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();
-        }
 }
 
@@ -126 +114 @@
 template< typename node_t >
 auto ast::Pass< core_t >::call_accept( const node_t * node ) ->
-        typename ast::Pass< core_t >::template generic_call_accept_result<node_t>::type
-{
+                ast::Pass< core_t >::call_accept_result_t<node_t> {
         __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 );
-        __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 };
+        return { nval != node, nval };
 }
 
@@ -230 +191 @@
 ast::__pass::template resultNstmt<container_t> ast::Pass< core_t >::call_accept( const container_t< ptr<Stmt> > & statements ) {
         __pedantic_pass_assert( __visit_children() );
-        if ( statements.empty() ) return {};
+        __pedantic_pass_assert( !statements.empty() );
 
         // We are going to aggregate errors for all these statements
@@ -263 +224 @@
                         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
@@ -276 +236 @@
                         // Now add the statement if there is one
                         if ( new_stmt != stmt ) {
-                                new_kids.values.emplace_back( new_stmt, i, false );
+                                new_kids.differs = true;
+                                new_kids.values.emplace_back( new_stmt );
                         } else {
-                                new_kids.values.emplace_back( nullptr, i, true );
+                                new_kids.values.emplace_back( i );
                         }
 
@@ -298 +259 @@
 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() );
-        if ( container.empty() ) return {};
+        __pedantic_pass_assert( !container.empty() );
+
+        // Collect errors from processing all these nodes.
         SemanticErrorException errors;
 
@@ -342 +305 @@
         static_assert( !std::is_same<const ast::Node * &, decltype(old_val)>::value, "ERROR" );
 
-        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 result = call_accept( old_val );
+        if ( result.differs ) {
                 auto new_parent = __pass::mutate<core_t>(parent);
-                new_val.apply(new_parent, field);
+                result.apply( new_parent, field );
                 parent = new_parent;
         }
@@ -366 +326 @@
         static_assert( !std::is_same<const ast::Node * &, decltype(old_val)>::value, "ERROR" );
 
-        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 result = call_accept_top( old_val );
+        if ( result.differs ) {
                 auto new_parent = __pass::mutate<core_t>(parent);
-                new_val.apply(new_parent, field);
+                result.apply( new_parent, field );
                 parent = new_parent;
         }
@@ -390 +347 @@
         static_assert( !std::is_same<const ast::Node * &, decltype(old_val)>::value, "ERROR" );
 
-        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 result = call_accept_as_compound( old_val );
+        if ( result.differs ) {
                 auto new_parent = __pass::mutate<core_t>(parent);
-                new_val.apply( new_parent, child );
+                result.apply( new_parent, child );
                 parent = new_parent;
         }

src/AST/Pass.proto.hpp

@@ -154 +154 @@
                 bool is_old;
 
-                delta(const Stmt * s, ssize_t i, bool old) :
-                        new_val(s), old_idx(i), is_old(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) {}
         };
 
@@ -188 +188 @@
                 std::transform( stmts->begin(), stmts->end(), std::back_inserter( values ),
                         [](ast::ptr<ast::Stmt>& stmt) -> delta {
-                                return delta( stmt.release(), -1, false );
+                                return delta( stmt.release() );
                         });
                 stmts->clear();
@@ -201 +201 @@
                         [](ast::ptr<ast::Decl>& decl) -> delta {
                                 ast::Decl const * d = decl.release();
-                                return delta( new DeclStmt( d->location, d ), -1, false );
+                                return delta( new DeclStmt( d->location, d ) );
                         });
                 decls->clear();