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

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"
@@ -27 +26 @@
 //                          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
-// | WithGuards           - provides the ability to save/restore data like a LIFO stack; to save, call GuardValue with the variable to save, the variable
+// | WithScopes           - 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.
 //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -33 +32 @@
 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;
+        }
 };
 
@@ -272 +283 @@
 
 public:
-        TypeSubstitution * env = nullptr;
+        TypeSubstitution * env;
 };
 
@@ -284 +295 @@
         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 WithGuards {
-protected:
-        WithGuards() = default;
-        ~WithGuards() = default;
+class WithScopes {
+protected:
+        WithScopes() = default;
+        ~WithScopes() = 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 );
-        }
 };
 
@@ -336 +323 @@
 class WithVisitorRef {
 protected:
-        WithVisitorRef() {}
-        ~WithVisitorRef() {}
-
-public:
-        PassVisitor<pass_type> * const visitor = nullptr;
+        WithVisitorRef() = default;
+        ~WithVisitorRef() = default;
+
+public:
+        PassVisitor<pass_type> * const visitor;
 };