Changeset 4eb31f2b

Timestamp:

Jun 16, 2017, 3:22:50 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

f522618

Parents:

7bd712d

Message:

Added base clases for passes to improve ease of use of the pass visitor

Location:

src

Files:

• Common/PassVisitor.h (modified) (5 diffs)
• InitTweak/GenInit.cc (modified) (3 diffs)

src/Common/PassVisitor.h

@@ -258 +258 @@
         ~WithTypeSubstitution() = default;
 
+public:
         TypeSubstitution * env;
-
-        template<typename pass_type>
-        friend class PassVisitor< pass_type>;
 };
 
@@ -269 +267 @@
         ~WithStmtsToAdd() = default;
 
+public:
         std::list< Statement* > stmtsToAddBefore;
         std::list< Statement* > stmtsToAddAfter;
-
-        template<typename pass_type>
-        friend class PassVisitor< pass_type>;
 };
 
@@ -281 +277 @@
         ~WithShortCircuiting() = default;
 
+public:
         bool skip_children;
-
-        template<typename pass_type>
-        friend class PassVisitor< pass_type>;
 };
 
@@ -292 +286 @@
         ~WithScopes() = default;
 
+public:
         at_cleanup_t at_cleanup;
 
+        template< typename T >
         void GuardValue( T& val ) {
                 at_cleanup( [ val ]( void * newVal ) {
@@ -299 +295 @@
                 }, static_cast< void * >( & val ) );
         }
-
-        template<typename pass_type>
-        friend class PassVisitor< pass_type>;
 };
 

src/InitTweak/GenInit.cc

@@ -44 +44 @@
         }
 
-        class ReturnFixer {
+        class ReturnFixer : public WithStmtsToAdd, public WithScopes {
           public:
                 /// consistently allocates a temporary variable for the return value
@@ -53 +53 @@
                 void premutate( FunctionDecl *functionDecl );
                 void premutate( ReturnStmt * returnStmt );
-
-                at_cleanup_t at_cleanup;
-                std::list< Statement * > stmtsToAddBefore;
 
           protected:
@@ -160 +157 @@
 
         void ReturnFixer::premutate( FunctionDecl *functionDecl ) {
-                GuardValue( this, ftype );
-                GuardValue( this, funcName );
+                GuardValue( ftype );
+                GuardValue( funcName );
 
                 ftype = functionDecl->get_functionType();