Changeset c3f551b

Timestamp:

Nov 30, 2017, 6:06:46 PM (8 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:

0a6aad4

Parents:

ef3d798

git-author:

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

git-committer:

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

Message:

Convert InitFlattener to PassVisitor

File:

• src/InitTweak/InitTweak.cc (modified) (1 diff)

src/InitTweak/InitTweak.cc

@@ -67 +67 @@
                 };
 
-                class InitFlattener : public Visitor {
-                        public:
-                        virtual void visit( SingleInit * singleInit );
-                        virtual void visit( ListInit * listInit );
+                struct InitFlattener : public WithShortCircuiting {
+                        void previsit( SingleInit * singleInit ) {
+                                visit_children = false;
+                                argList.push_back( singleInit->value->clone() );
+                        }
                         std::list< Expression * > argList;
                 };
 
-                void InitFlattener::visit( SingleInit * singleInit ) {
-                        argList.push_back( singleInit->get_value()->clone() );
-                }
-
-                void InitFlattener::visit( ListInit * listInit ) {
-                        // flatten nested list inits
-                        std::list<Initializer*>::iterator it = listInit->begin();
-                        for ( ; it != listInit->end(); ++it ) {
-                                (*it)->accept( *this );
-                        }
-                }
         }
 
         std::list< Expression * > makeInitList( Initializer * init ) {
-                InitFlattener flattener;
+                PassVisitor<InitFlattener> flattener;
                 maybeAccept( init, flattener );
-                return flattener.argList;
+                return flattener.pass.argList;
         }