Changeset b73bd70

Timestamp:

Jun 22, 2017, 1:13:26 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

186b398

Parents:

65dc863

Message:

PassVisitor? now properly copes skip-children

Location:

src/Common

Files:

• PassVisitor.h (modified) (5 diffs)
• PassVisitor.impl.h (modified) (2 diffs)
• PassVisitor.proto.h (modified) (3 diffs)

src/Common/PassVisitor.h

@@ -37 +37 @@
         PassVisitor(Args &&... args)
                 : pass( std::forward<Args>( args )... )
-        {}
+        {
+                typedef PassVisitor<pass_type> this_t;
+                this_t * const * visitor = visitor_impl(pass, 0);
+                if(visitor) {
+                        *const_cast<this_t **>( visitor ) = this;
+                }
+        }
 
         virtual ~PassVisitor() = default;
@@ -240 +246 @@
         std::list< Declaration* > *     get_beforeDecls() { return declsToAddBefore_impl( pass, 0); }
         std::list< Declaration* > *     get_afterDecls () { return declsToAddAfter_impl ( pass, 0); }
-        bool visit_children() { bool* skip = skip_children_impl(pass, 0); return ! (skip && *skip); }
-        void reset_visit() { bool* skip = skip_children_impl(pass, 0); if(skip) *skip = false; }
+
+        void set_visit_children( bool& ref ) { bool_ref * ptr = visit_children_impl(pass, 0); if(ptr) ptr->set( ref ); }
 
         guard_value_impl init_guard() {
@@ -280 +286 @@
         std::list< Statement* > stmtsToAddAfter;
 };
-
 class WithShortCircuiting {
 protected:
@@ -287 +292 @@
 
 public:
-        bool skip_children;
+        bool_ref visit_children;
 };
 
@@ -306 +311 @@
 };
 
+template<typename pass_type>
+class WithVisitorRef {
+protected:
+        WithVisitorRef() = default;
+        ~WithVisitorRef() = default;
+
+public:
+        PassVisitor<pass_type> * const visitor;
+};
 
 #include "PassVisitor.impl.h"

src/Common/PassVisitor.impl.h

@@ -4 +4 @@
         __attribute__((unused))                   \
         const auto & guard = init_guard();        \
+        bool visit_children = true;               \
+        set_visit_children( visit_children );   \
         call_previsit( node );                    \
-        if( visit_children() ) {                  \
+        if( visit_children ) {                    \
 
 #define VISIT_END( node )                       \
         }                                         \
-        reset_visit();                            \
         call_postvisit( node );                   \
 
@@ -15 +16 @@
         __attribute__((unused))                   \
         const auto & guard = init_guard();        \
+        bool visit_children = true;               \
+        set_visit_children( visit_children );   \
         call_premutate( node );                   \
-        if( visit_children() ) {                  \
+        if( visit_children ) {                    \
 
 #define MUTATE_END( type, node )                \
         }                                         \
-        reset_visit();                            \
         return call_postmutate< type * >( node ); \
 

src/Common/PassVisitor.proto.h

@@ -1 +1 @@
 #pragma once
+
+template<typename pass_type>
+class PassVisitor;
 
 typedef std::function<void( void * )> cleanup_func_t;
@@ -31 +34 @@
 
 typedef std::function< void( cleanup_func_t, void * ) > at_cleanup_t;
+
+class bool_ref {
+public:
+        bool_ref() = default;
+        ~bool_ref() = default;
+
+        operator bool() { return *m_ref; }
+        bool operator=( bool val ) { return *m_ref = val; }
+
+private:
+
+        template<typename pass>
+        friend class PassVisitor;
+
+        void set( bool & val ) { m_ref = &val; };
+
+        bool * m_ref;
+};
 
 //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -114 +135 @@
 FIELD_PTR( std::list< Declaration* >, declsToAddBefore )
 FIELD_PTR( std::list< Declaration* >, declsToAddAfter  )
-FIELD_PTR( bool, skip_children )
+FIELD_PTR( bool_ref, visit_children )
 FIELD_PTR( at_cleanup_t, at_cleanup )
+FIELD_PTR( PassVisitor<pass_type> * const, visitor )