Changes in src/Common/PassVisitor.proto.h [3c398b6:522363e]

File:

• src/Common/PassVisitor.proto.h (modified) (1 diff)

src/Common/PassVisitor.proto.h

@@ -46 +46 @@
         ~bool_ref() = default;
 
-        operator bool() { return m_ref ? *m_ref : true; }
+        operator bool() { return *m_ref; }
         bool operator=( bool val ) { return *m_ref = val; }
 
 private:
 
-        friend class ChildrenGuard;
-
-        bool * set( bool & val ) {
-                bool * prev = m_ref;
-                m_ref = &val;
-                return prev;
-        }
-
-        bool * m_ref = nullptr;
+        template<typename pass>
+        friend class PassVisitor;
+
+        void set( bool & val ) { m_ref = &val; };
+
+        bool * m_ref;
 };
 
-class ChildrenGuard {
-public:
-
-        ChildrenGuard( bool_ref * ref )
-                : m_val ( true )
-                , m_prev( ref ? ref->set( m_val ) : nullptr )
-                , m_ref ( ref )
-        {}
-
-        ~ChildrenGuard() {
-                if( m_ref ) {
-                        m_ref->set( *m_prev );
-                }
-        }
-
-        operator bool() { return m_val; }
-
-private:
-        bool       m_val;
-        bool     * m_prev;
-        bool_ref * m_ref;
-};
+template< typename TreeType, typename VisitorType >
+inline void indexerScopedAccept( TreeType * tree, VisitorType & visitor ) {
+        auto guard = makeFuncGuard(
+                [&visitor]() { visitor.indexerScopeEnter(); },
+                [&visitor]() { visitor.indexerScopeLeave(); }
+        );
+        maybeAccept( tree, visitor );
+}
+
+template< typename TreeType, typename MutatorType >
+inline void indexerScopedMutate( TreeType *& tree, MutatorType & mutator ) {
+        auto guard = makeFuncGuard(
+                [&mutator]() { mutator.indexerScopeEnter(); },
+                [&mutator]() { mutator.indexerScopeLeave(); }
+        );
+        tree = maybeMutate( tree, mutator );
+}
+
+template< typename TreeType, typename MutatorType >
+inline void maybeMutateRef( TreeType *& tree, MutatorType & mutator ) {
+        tree = maybeMutate( tree, mutator );
+}
 
 //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------