Changeset 62423350 for src/Common

Timestamp:

Jun 29, 2017, 5:06:24 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

a12d5aa

Parents:

bb1cd95

Message:

Big push on designations and initialization: works with generic types, tuples, arrays, tests pass.
Refactor guard_value_impl.
Add list of declarations to TupleType.

Location:

src/Common

Files:

• PassVisitor.h (modified) (1 diff)
• PassVisitor.impl.h (modified) (2 diffs)
• PassVisitor.proto.h (modified) (2 diffs)

src/Common/PassVisitor.h

@@ -257 +257 @@
 
         void set_visit_children( bool& ref ) { bool_ref * ptr = visit_children_impl(pass, 0); if(ptr) ptr->set( ref ); }
-
-        guard_value_impl init_guard() {
-                guard_value_impl guard;
-                auto at_cleanup = at_cleanup_impl(pass, 0);
-                if( at_cleanup ) {
-                        *at_cleanup = [&guard]( cleanup_func_t && func, void* val ) {
-                                guard.push( std::move( func ), val );
-                        };
-                }
-                return guard;
-        }
 };
 

src/Common/PassVisitor.impl.h

@@ -3 +3 @@
 #define VISIT_START( node )                     \
         __attribute__((unused))                   \
-        const auto & guard = init_guard();        \
+        guard_value_impl guard( at_cleanup_impl(pass, 0) );       \
         bool visit_children = true;               \
         set_visit_children( visit_children );   \
@@ -15 +15 @@
 #define MUTATE_START( node )                    \
         __attribute__((unused))                   \
-        const auto & guard = init_guard();        \
+        guard_value_impl guard( at_cleanup_impl(pass, 0) );       \
         bool visit_children = true;               \
         set_visit_children( visit_children );   \

src/Common/PassVisitor.proto.h

@@ -5 +5 @@
 
 typedef std::function<void( void * )> cleanup_func_t;
+typedef std::function< void( cleanup_func_t, void * ) > at_cleanup_t;
 
 class guard_value_impl {
 public:
-        guard_value_impl() = default;
+        guard_value_impl( at_cleanup_t * at_cleanup ) {
+                if( at_cleanup ) {
+                        *at_cleanup = [this]( cleanup_func_t && func, void* val ) {
+                                push( std::move( func ), val );
+                        };
+                }
+        }
 
         ~guard_value_impl() {
@@ -33 +40 @@
 };
 
-typedef std::function< void( cleanup_func_t, void * ) > at_cleanup_t;
 
 class bool_ref {