Changes in src/Common/PassVisitor.h [6ca154b:62423350]

File:

• src/Common/PassVisitor.h (modified) (9 diffs)

src/Common/PassVisitor.h

@@ -12 +12 @@
 #include "SynTree/Expression.h"
 #include "SynTree/Constant.h"
+#include "SynTree/TypeSubstitution.h"
 
 #include "PassVisitor.proto.h"
@@ -26 +27 @@
 //                          stmtsToAddBefore or stmtsToAddAfter respectively.
 // | WithShortCircuiting  - provides the ability to skip visiting child nodes; set visit_children to false in pre{visit,mutate} to skip visiting children
-// | WithScopes           - provides the ability to save/restore data like a LIFO stack; to save, call GuardValue with the variable to save, the variable
+// | WithGuards           - provides the ability to save/restore data like a LIFO stack; to save, call GuardValue with the variable to save, the variable
 //                          will automatically be restored to its previous value after the corresponding postvisit/postmutate teminates.
 //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -32 +33 @@
 class PassVisitor final : public Visitor, public Mutator {
 public:
-        PassVisitor() = default;
 
         template< typename... Args >
@@ -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;
-        }
 };
 
@@ -283 +272 @@
 
 public:
-        TypeSubstitution * env;
+        TypeSubstitution * env = nullptr;
 };
 
@@ -295 +284 @@
         std::list< Statement* > stmtsToAddAfter;
 };
+
+class WithDeclsToAdd {
+protected:
+        WithDeclsToAdd() = default;
+        ~WithDeclsToAdd() = default;
+
+public:
+        std::list< Declaration* > declsToAddBefore;
+        std::list< Declaration* > declsToAddAfter;
+};
+
 class WithShortCircuiting {
 protected:
@@ -304 +304 @@
 };
 
-class WithScopes {
-protected:
-        WithScopes() = default;
-        ~WithScopes() = default;
+class WithGuards {
+protected:
+        WithGuards() = default;
+        ~WithGuards() = default;
 
 public:
@@ -318 +318 @@
                 }, static_cast< void * >( & val ) );
         }
+
+        template< typename T >
+        void GuardScope( T& val ) {
+                val.beginScope();
+                at_cleanup( []( void * val ) {
+                        static_cast< T * >( val )->endScope();
+                }, static_cast< void * >( & val ) );
+        }
+
+        template< typename Func >
+        void GuardAction( Func func ) {
+                at_cleanup( [func](__attribute__((unused)) void *) { func(); }, nullptr );
+        }
 };
 
@@ -323 +336 @@
 class WithVisitorRef {
 protected:
-        WithVisitorRef() = default;
-        ~WithVisitorRef() = default;
-
-public:
-        PassVisitor<pass_type> * const visitor;
+        WithVisitorRef() {}
+        ~WithVisitorRef() {}
+
+public:
+        PassVisitor<pass_type> * const visitor = nullptr;
 };