Changeset d24d4e1 for src/Common/PassVisitor.h

Timestamp:

Jun 23, 2017, 12:12:46 PM (7 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:

2a7b3ca

Parents:

ba915fb5

Message:

convert more passes to PassVisitor?, fix PassVisitor? constructor bug, add WithDeclsToAdd? parent class

File:

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

src/Common/PassVisitor.h

@@ -26 +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
-// | 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 +32 @@
 class PassVisitor final : public Visitor, public Mutator {
 public:
-        PassVisitor() = default;
 
         template< typename... Args >
@@ -283 +282 @@
 
 public:
-        TypeSubstitution * env;
+        TypeSubstitution * env = nullptr;
 };
 
@@ -295 +294 @@
         std::list< Statement* > stmtsToAddAfter;
 };
+
+class WithDeclsToAdd {
+protected:
+        WithDeclsToAdd() = default;
+        ~WithDeclsToAdd() = default;
+
+public:
+        std::list< Declaration* > declsToAddBefore;
+        std::list< Declaration* > declsToAddAfter;
+};
+
 class WithShortCircuiting {
 protected:
@@ -304 +314 @@
 };
 
-class WithScopes {
-protected:
-        WithScopes() = default;
-        ~WithScopes() = default;
+class WithGuards {
+protected:
+        WithGuards() = default;
+        ~WithGuards() = default;
 
 public:
@@ -319 +329 @@
         }
 
+        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( std::forward<Func>( func ) );
+        void GuardAction( Func func ) {
+                at_cleanup( [func](__attribute__((unused)) void *) { func(); }, nullptr );
         }
 };
@@ -328 +346 @@
 class WithVisitorRef {
 protected:
-        WithVisitorRef() = default;
-        ~WithVisitorRef() = default;
-
-public:
-        PassVisitor<pass_type> * const visitor;
+        WithVisitorRef() {}
+        ~WithVisitorRef() {}
+
+public:
+        PassVisitor<pass_type> * const visitor = nullptr;
 };