Changeset 2bf9c37

Timestamp:

Sep 1, 2017, 2:39:52 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:

a984e65

Parents:

9b18044

Message:

Refactor Validate filter into utility

Location:

src

Files:

• Common/utility.h (modified) (1 diff)
• SymTab/Validate.cc (modified) (3 diffs)

src/Common/utility.h

@@ -172 +172 @@
 auto filter(Args&&... args) -> decltype(std::copy_if(std::forward<Args>(args)...)) {
   return std::copy_if(std::forward<Args>(args)...);
+}
+
+template <typename E, typename UnaryPredicate, template< typename, typename...> class Container, typename... Args >
+void filter( Container< E *, Args... > & container, UnaryPredicate pred, bool doDelete ) {
+        auto i = begin( container );
+        while ( i != end( container ) ) {
+                auto it = next( i );
+                if ( pred( *i ) ) {
+                        if ( doDelete ) {
+                                delete *i;
+                        } // if
+                        container.erase( i );
+                } // if
+                i = it;
+        } // while
 }
 

src/SymTab/Validate.cc

@@ -291 +291 @@
 
         HoistStruct::HoistStruct() : inStruct( false ) {
-        }
-
-        void filter( std::list< Declaration * > &declList, bool (*pred)( Declaration * ), bool doDelete ) {
-                std::list< Declaration * >::iterator i = declList.begin();
-                while ( i != declList.end() ) {
-                        std::list< Declaration * >::iterator next = i;
-                        ++next;
-                        if ( pred( *i ) ) {
-                                if ( doDelete ) {
-                                        delete *i;
-                                } // if
-                                declList.erase( i );
-                        } // if
-                        i = next;
-                } // while
         }
 
@@ -797 +782 @@
                 CompoundStmt *ret = Mutator::mutate( compoundStmt );
                 scopeLevel -= 1;
-                std::list< Statement * >::iterator i = compoundStmt->get_kids().begin();
-                while ( i != compoundStmt->get_kids().end() ) {
-                        std::list< Statement * >::iterator next = i+1;
-                        if ( DeclStmt *declStmt = dynamic_cast< DeclStmt * >( *i ) ) {
+                // remove and delete decl stmts
+                filter( compoundStmt->kids, [](Statement * stmt) {
+                        if ( DeclStmt *declStmt = dynamic_cast< DeclStmt * >( stmt ) ) {
                                 if ( dynamic_cast< TypedefDecl * >( declStmt->get_decl() ) ) {
-                                        delete *i;
-                                        compoundStmt->get_kids().erase( i );
+                                        return true;
                                 } // if
                         } // if
-                        i = next;
-                } // while
+                        return false;
+                }, true);
                 typedefNames.endScope();
                 return ret;
@@ -816 +799 @@
         template<typename AggDecl>
         AggDecl *EliminateTypedef::handleAggregate( AggDecl * aggDecl ) {
-                std::list<Declaration *>::iterator it = aggDecl->get_members().begin();
-                for ( ; it != aggDecl->get_members().end(); ) {
-                        std::list< Declaration * >::iterator next = it+1;
-                        if ( dynamic_cast< TypedefDecl * >( *it ) ) {
-                                delete *it;
-                                aggDecl->get_members().erase( it );
-                        } // if
-                        it = next;
-                }
+                filter( aggDecl->members, isTypedef, true );
                 return aggDecl;
         }