Changeset 6840e7c for src/Common/PassVisitor.proto.h

Timestamp:

Oct 19, 2017, 12:01:04 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

837ce06

Parents:

b96ec83 (diff), a15b72c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

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

src/Common/PassVisitor.proto.h

@@ -46 +46 @@
         ~bool_ref() = default;
 
-        operator bool() { return *m_ref; }
+        operator bool() { return m_ref ? *m_ref : true; }
         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;
+        friend class ChildrenGuard;
+
+        bool * set( bool & val ) {
+                bool * prev = m_ref;
+                m_ref = &val;
+                return prev;
+        }
+
+        bool * m_ref = nullptr;
 };
 
-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 );
-}
+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;
+};
 
 //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------