Changeset 0a6aad4 for src/InitTweak

Timestamp:

Nov 30, 2017, 6:06: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:

c5f3c68

Parents:

c3f551b

git-author:

Rob Schluntz <rschlunt@…> (11/30/17 17:40:49)

git-committer:

Rob Schluntz <rschlunt@…> (11/30/17 18:06:46)

Message:

Convert CallFinder? to PassVisitor?

File:

• src/InitTweak/InitTweak.cc (modified) (3 diffs)

src/InitTweak/InitTweak.cc

@@ -307 +307 @@
         }
 
-        class CallFinder : public Visitor {
-        public:
-                typedef Visitor Parent;
+        struct CallFinder {
                 CallFinder( const std::list< std::string > & names ) : names( names ) {}
 
-                virtual void visit( ApplicationExpr * appExpr ) {
+                void postvisit( ApplicationExpr * appExpr ) {
                         handleCallExpr( appExpr );
                 }
 
-                virtual void visit( UntypedExpr * untypedExpr ) {
+                void postvisit( UntypedExpr * untypedExpr ) {
                         handleCallExpr( untypedExpr );
                 }
@@ -326 +324 @@
                 template< typename CallExpr >
                 void handleCallExpr( CallExpr * expr ) {
-                        Parent::visit( expr );
                         std::string fname = getFunctionName( expr );
                         if ( std::find( names.begin(), names.end(), fname ) != names.end() ) {
@@ -335 +332 @@
 
         void collectCtorDtorCalls( Statement * stmt, std::list< Expression * > & matches ) {
-                static CallFinder finder( std::list< std::string >{ "?{}", "^?{}" } );
-                finder.matches = &matches;
+                static PassVisitor<CallFinder> finder( std::list< std::string >{ "?{}", "^?{}" } );
+                finder.pass.matches = &matches;
                 maybeAccept( stmt, finder );
         }