Changeset 6840e7c for src/Common/PassVisitor.h

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 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.h (modified) (3 diffs)

src/Common/PassVisitor.h

@@ -4 +4 @@
 
 #include <stack>
+
+#include "Common/utility.h"
 
 #include "SynTree/Mutator.h"
@@ -236 +238 @@
         virtual Attribute * mutate( Attribute * attribute ) override final;
 
+        virtual TypeSubstitution * mutate( TypeSubstitution * sub ) final;
+
 private:
         template<typename pass_t> friend void acceptAll( std::list< Declaration* > &decls, PassVisitor< pass_t >& visitor );
         template<typename pass_t> friend void mutateAll( std::list< Declaration* > &decls, PassVisitor< pass_t >& visitor );
+        template< typename TreeType, typename pass_t > friend void maybeAccept_impl( TreeType * tree, PassVisitor< pass_t > & visitor );
+        template< typename TreeType, typename pass_t > friend void maybeMutate_impl( TreeType *& tree, PassVisitor< pass_t > & mutator );
+        template< typename Container, typename pass_t > friend void maybeAccept_impl( Container & container, PassVisitor< pass_t > & visitor );
+        template< typename Container, typename pass_t > friend void maybeMutate_impl( Container & container, PassVisitor< pass_t > & mutator );
 
         template<typename node_type> void call_previsit ( node_type * node ) { previsit_impl ( pass, node, 0 ); }
@@ -273 +281 @@
         std::list< Declaration* > *     get_afterDecls () { return declsToAddAfter_impl ( pass, 0); }
 
-        void set_visit_children( bool& ref ) { bool_ref * ptr = visit_children_impl(pass, 0); if(ptr) ptr->set( ref ); }
+        bool       get_visit_children    () { bool_ref * ptr = visit_children_impl(pass, 0); return ptr ? *ptr : true; }
+        bool_ref * get_visit_children_ptr() { return visit_children_impl(pass, 0); }
 
         void indexerScopeEnter  ()                             { indexer_impl_enterScope  ( pass, 0       ); }