Changeset c13e8dc8 for src/ControlStruct/LabelFixer.h

Timestamp:

Dec 5, 2017, 2:35:03 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f9feab8

Parents:

9c35431 (diff), 65197c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

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
@@ -26 +27 @@
 namespace ControlStruct {
         /// normalizes label definitions and generates multi-level exit labels
-class LabelGenerator;
+        class LabelGenerator;
 
-        class LabelFixer final : public Visitor {
-                typedef Visitor Parent;
+        class LabelFixer final : public WithGuards {
           public:
                 LabelFixer( LabelGenerator *gen = 0 );
@@ -35 +35 @@
                 std::map < Label, Statement * > *resolveJumps() throw ( SemanticError );
 
-                using Visitor::visit;
-
                 // Declarations
-                virtual void visit( FunctionDecl *functionDecl ) override;
+                void previsit( FunctionDecl *functionDecl );
+                void postvisit( FunctionDecl *functionDecl );
 
                 // Statements
-                void visit( Statement *stmt );
+                void previsit( Statement *stmt );
+                void previsit( BranchStmt *branchStmt );
 
-                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;
+                // Expressions
+                void previsit( LabelAddressExpr *addrExpr );
 
                 Label setLabelsDef( std::list< Label > &, Statement *definition );