Changeset c0aa336 for src/SymTab/AddVisit.h

Timestamp:

Feb 6, 2017, 4:19:41 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

b4d65c7

Parents:

a362f97

Message:

third attempt at gcc attributes

File:

• src/SymTab/AddVisit.h (modified) (3 diffs)

src/SymTab/AddVisit.h

@@ -10 +10 @@
 // Created On       : Sun May 17 16:14:32 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:22:01 2016
-// Update Count     : 9
+// Last Modified On : Thu Feb  2 16:36:02 2017
+// Update Count     : 14
 //
 
@@ -18 +18 @@
 
         template< typename Visitor >
-        inline void addVisitStatementList( std::list< Statement* > &statements, Visitor &visitor ) {
-                for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
-                        addDecls( visitor.get_declsToAdd(), statements, i );
-                        (*i)->accept( visitor );
-                } // for
-                addDecls( visitor.get_declsToAdd(), statements, statements.end() );
+        inline void addVisitStatementList( std::list< Statement* > &stmts, Visitor &visitor ) {
+                for ( std::list< Statement* >::iterator stmt = stmts.begin(); ; ++stmt ) {
+                        // add any new declarations after the previous statement
+                        for ( std::list< Declaration* >::iterator decl = visitor.declsToAddAfter.begin(); decl != visitor.declsToAddAfter.end(); ++decl ) {
+                                DeclStmt *declStmt = new DeclStmt( noLabels, *decl );
+                                stmts.insert( stmt, declStmt );
+                        }
+                        visitor.declsToAddAfter.clear();
+
+                        if ( stmt == stmts.end() ) break;
+                        
+                        // run mutator on statement
+                        maybeAccept( *stmt, visitor );
+
+                        // add any new declarations before the statement
+                        for ( std::list< Declaration* >::iterator decl = visitor.declsToAdd.begin(); decl != visitor.declsToAdd.end(); ++decl ) {
+                                DeclStmt *declStmt = new DeclStmt( noLabels, *decl );
+                                stmts.insert( stmt, declStmt );
+                        }
+                        visitor.declsToAdd.clear();
+                }
         }
 
@@ -38 +53 @@
 
         template< typename Visitor >
-        void acceptAndAdd( std::list< Declaration * > &translationUnit, Visitor &visitor, bool addBefore ) {
-                std::list< Declaration * >::iterator i = translationUnit.begin();
-                while ( i != translationUnit.end() ) {
-                        (*i)->accept( visitor );
-                        std::list< Declaration * >::iterator next = i;
-                        next++;
-                        if ( ! visitor.get_declsToAdd().empty() ) {
-                                translationUnit.splice( addBefore ? i : next, visitor.get_declsToAdd() );
-                        } // if
-                        i = next;
-                } // while
+        void acceptAndAdd( std::list< Declaration * > &translationUnit, Visitor &visitor ) {
+                for ( std::list< Declaration* >::iterator decl = translationUnit.begin(); ; ++decl ) {
+                        // splice in new declarations after previous decl
+                        translationUnit.splice( decl, visitor.declsToAddAfter );
+
+                        if ( decl == translationUnit.end() ) break;
+                        
+                        // run mutator on declaration
+                        maybeAccept( *decl, visitor );
+
+                        // splice in new declarations before current decl
+                        translationUnit.splice( decl, visitor.declsToAdd );
+                }
         }