Changes in src/ControlStruct/LabelFixer.h [1fbeebd:d180746]

File:

• src/ControlStruct/LabelFixer.h (modified) (3 diffs)

src/ControlStruct/LabelFixer.h

@@ -19 +19 @@
 #include <map>                     // for map
 
-#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "SynTree/Label.h"         // for Label
@@ -27 +26 @@
 namespace ControlStruct {
         /// normalizes label definitions and generates multi-level exit labels
-        class LabelGenerator;
+class LabelGenerator;
 
-        class LabelFixer final : public WithGuards {
+        class LabelFixer final : public Visitor {
+                typedef Visitor Parent;
           public:
                 LabelFixer( LabelGenerator *gen = 0 );
@@ -35 +35 @@
                 std::map < Label, Statement * > *resolveJumps() throw ( SemanticError );
 
+                using Visitor::visit;
+
                 // Declarations
-                void previsit( FunctionDecl *functionDecl );
-                void postvisit( FunctionDecl *functionDecl );
+                virtual void visit( FunctionDecl *functionDecl ) override;
 
                 // Statements
-                void previsit( Statement *stmt );
-                void previsit( BranchStmt *branchStmt );
+                void visit( Statement *stmt );
 
-                // Expressions
-                void previsit( LabelAddressExpr *addrExpr );
+                virtual void visit( CompoundStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( NullStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( ExprStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( IfStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( WhileStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( ForStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( SwitchStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( CaseStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( ReturnStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( TryStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( CatchStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( DeclStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( BranchStmt *branchStmt ) override;
+                virtual void visit( UntypedExpr *untyped ) override;
 
                 Label setLabelsDef( std::list< Label > &, Statement *definition );