Changeset a09e45b

Timestamp:

Dec 1, 2017, 11:25:58 AM (6 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:

d16d159

Parents:

ad6cd6d

Message:

Convert HoistStruct? to PassVisitor?

File:

• src/SymTab/Validate.cc (modified) (3 diffs)

src/SymTab/Validate.cc

@@ -81 +81 @@
 
 namespace SymTab {
-        class HoistStruct final : public Visitor {
-                template< typename Visitor >
-                friend void acceptAndAdd( std::list< Declaration * > &translationUnit, Visitor &visitor );
-            template< typename Visitor >
-            friend void addVisitStatementList( std::list< Statement* > &stmts, Visitor &visitor );
-          public:
+        struct HoistStruct final : public WithDeclsToAdd, public WithGuards {
                 /// Flattens nested struct types
                 static void hoistStruct( std::list< Declaration * > &translationUnit );
 
-                std::list< Declaration * > &get_declsToAdd() { return declsToAdd; }
-
-                virtual void visit( EnumInstType *enumInstType );
-                virtual void visit( StructInstType *structInstType );
-                virtual void visit( UnionInstType *unionInstType );
-                virtual void visit( StructDecl *aggregateDecl );
-                virtual void visit( UnionDecl *aggregateDecl );
-
-                virtual void visit( CompoundStmt *compoundStmt );
-                virtual void visit( SwitchStmt *switchStmt );
+                void previsit( EnumInstType * enumInstType );
+                void previsit( StructInstType * structInstType );
+                void previsit( UnionInstType * unionInstType );
+                void previsit( StructDecl * aggregateDecl );
+                void previsit( UnionDecl * aggregateDecl );
+
           private:
-                HoistStruct();
-
                 template< typename AggDecl > void handleAggregate( AggDecl *aggregateDecl );
 
-                std::list< Declaration * > declsToAdd, declsToAddAfter;
-                bool inStruct;
+                bool inStruct = false;
         };
 
@@ -305 +293 @@
 
         void HoistStruct::hoistStruct( std::list< Declaration * > &translationUnit ) {
-                HoistStruct hoister;
-                acceptAndAdd( translationUnit, hoister );
-        }
-
-        HoistStruct::HoistStruct() : inStruct( false ) {
+                PassVisitor<HoistStruct> hoister;
+                acceptAll( translationUnit, hoister );
         }
 
@@ -320 +305 @@
                 if ( inStruct ) {
                         // Add elements in stack order corresponding to nesting structure.
-                        declsToAdd.push_front( aggregateDecl );
-                        Visitor::visit( aggregateDecl );
+                        declsToAddBefore.push_front( aggregateDecl );
                 } else {
+                        GuardValue( inStruct );
                         inStruct = true;
-                        Visitor::visit( aggregateDecl );
-                        inStruct = false;
                 } // if
                 // Always remove the hoisted aggregate from the inner structure.
-                filter( aggregateDecl->get_members(), isStructOrUnion, false );
-        }
-
-        void HoistStruct::visit( EnumInstType *structInstType ) {
-                if ( structInstType->get_baseEnum() ) {
-                        declsToAdd.push_front( structInstType->get_baseEnum() );
-                }
-        }
-
-        void HoistStruct::visit( StructInstType *structInstType ) {
-                if ( structInstType->get_baseStruct() ) {
-                        declsToAdd.push_front( structInstType->get_baseStruct() );
-                }
-        }
-
-        void HoistStruct::visit( UnionInstType *structInstType ) {
-                if ( structInstType->get_baseUnion() ) {
-                        declsToAdd.push_front( structInstType->get_baseUnion() );
-                }
-        }
-
-        void HoistStruct::visit( StructDecl *aggregateDecl ) {
+                GuardAction( [this, aggregateDecl]() { filter( aggregateDecl->members, isStructOrUnion, false ); } );
+        }
+
+        void HoistStruct::previsit( EnumInstType * inst ) {
+                if ( inst->baseEnum ) {
+                        declsToAddBefore.push_front( inst->baseEnum );
+                }
+        }
+
+        void HoistStruct::previsit( StructInstType * inst ) {
+                if ( inst->baseStruct ) {
+                        declsToAddBefore.push_front( inst->baseStruct );
+                }
+        }
+
+        void HoistStruct::previsit( UnionInstType * inst ) {
+                if ( inst->baseUnion ) {
+                        declsToAddBefore.push_front( inst->baseUnion );
+                }
+        }
+
+        void HoistStruct::previsit( StructDecl * aggregateDecl ) {
                 handleAggregate( aggregateDecl );
         }
 
-        void HoistStruct::visit( UnionDecl *aggregateDecl ) {
+        void HoistStruct::previsit( UnionDecl * aggregateDecl ) {
                 handleAggregate( aggregateDecl );
-        }
-
-        void HoistStruct::visit( CompoundStmt *compoundStmt ) {
-                addVisit( compoundStmt, *this );
-        }
-
-        void HoistStruct::visit( SwitchStmt *switchStmt ) {
-                addVisit( switchStmt, *this );
         }