Changes in src/SymTab/Validate.cc [a09e45b:1f370451]

File:

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

src/SymTab/Validate.cc

@@ -81 +81 @@
 
 namespace SymTab {
-        struct HoistStruct final : public WithDeclsToAdd, public WithGuards {
+        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:
                 /// Flattens nested struct types
                 static void hoistStruct( std::list< Declaration * > &translationUnit );
 
-                void previsit( EnumInstType * enumInstType );
-                void previsit( StructInstType * structInstType );
-                void previsit( UnionInstType * unionInstType );
-                void previsit( StructDecl * aggregateDecl );
-                void previsit( UnionDecl * aggregateDecl );
-
+                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 );
           private:
+                HoistStruct();
+
                 template< typename AggDecl > void handleAggregate( AggDecl *aggregateDecl );
 
-                bool inStruct = false;
+                std::list< Declaration * > declsToAdd, declsToAddAfter;
+                bool inStruct;
         };
 
@@ -293 +305 @@
 
         void HoistStruct::hoistStruct( std::list< Declaration * > &translationUnit ) {
-                PassVisitor<HoistStruct> hoister;
-                acceptAll( translationUnit, hoister );
+                HoistStruct hoister;
+                acceptAndAdd( translationUnit, hoister );
+        }
+
+        HoistStruct::HoistStruct() : inStruct( false ) {
         }
 
@@ -305 +320 @@
                 if ( inStruct ) {
                         // Add elements in stack order corresponding to nesting structure.
-                        declsToAddBefore.push_front( aggregateDecl );
+                        declsToAdd.push_front( aggregateDecl );
+                        Visitor::visit( aggregateDecl );
                 } else {
-                        GuardValue( inStruct );
                         inStruct = true;
+                        Visitor::visit( aggregateDecl );
+                        inStruct = false;
                 } // if
                 // Always remove the hoisted aggregate from the inner structure.
-                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 ) {
+                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 ) {
                 handleAggregate( aggregateDecl );
         }
 
-        void HoistStruct::previsit( UnionDecl * aggregateDecl ) {
+        void HoistStruct::visit( UnionDecl *aggregateDecl ) {
                 handleAggregate( aggregateDecl );
+        }
+
+        void HoistStruct::visit( CompoundStmt *compoundStmt ) {
+                addVisit( compoundStmt, *this );
+        }
+
+        void HoistStruct::visit( SwitchStmt *switchStmt ) {
+                addVisit( switchStmt, *this );
         }