Changes in src/ControlStruct/FixLabels.cpp [37eb41b:a5a08a05]

File:

• src/ControlStruct/FixLabels.cpp (modified) (8 diffs)

src/ControlStruct/FixLabels.cpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Mon Nov  1 09:39:00 2021
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 31 22:19:17 2022
-// Update Count     : 9
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Nov  8 10:53:00 2021
+// Update Count     : 3
 //
 
@@ -20 +20 @@
 #include "AST/Stmt.hpp"
 #include "ControlStruct/MultiLevelExit.hpp"
-using namespace ast;
 
 namespace ControlStruct {
-class FixLabelsCore final : public WithGuards {
+
+namespace {
+
+class FixLabelsCore final : public ast::WithGuards {
         LabelToStmt labelTable;
-  public:
+public:
         FixLabelsCore() : labelTable() {}
 
-        void previsit( const FunctionDecl * );
-        const FunctionDecl * postvisit( const FunctionDecl * );
-        void previsit( const Stmt * );
-        void previsit( const BranchStmt * );
-        void previsit( const LabelAddressExpr * );
+        void previsit( const ast::FunctionDecl * );
+        const ast::FunctionDecl * postvisit( const ast::FunctionDecl * );
+        void previsit( const ast::Stmt * );
+        void previsit( const ast::BranchStmt * );
+        void previsit( const ast::LabelAddressExpr * );
 
-        void setLabelsDef( const std::vector<Label> &, const Stmt * );
-        void setLabelsUsage( const Label & );
+        void setLabelsDef( const std::vector<ast::Label> &, const ast::Stmt * );
+        void setLabelsUsage( const ast::Label & );
 };
 
-void FixLabelsCore::previsit( const FunctionDecl * ) {
+void FixLabelsCore::previsit( const ast::FunctionDecl * ) {
         GuardValue( labelTable ).clear();
 }
 
-const FunctionDecl * FixLabelsCore::postvisit(
-        const FunctionDecl * decl ) {
+const ast::FunctionDecl * FixLabelsCore::postvisit(
+                const ast::FunctionDecl * decl ) {
         if ( nullptr == decl->stmts ) return decl;
         for ( auto kvp : labelTable ) {
                 if ( nullptr == kvp.second ) {
                         SemanticError( kvp.first.location,
-                                                   "Use of undefined label: " + kvp.first.name );
+                                "Use of undefined label: " + kvp.first.name );
                 }
         }
-        return mutate_field( decl, &FunctionDecl::stmts,
-                                                 multiLevelExitUpdate( decl->stmts.get(), labelTable ) );
+        return ast::mutate_field( decl, &ast::FunctionDecl::stmts,
+                multiLevelExitUpdate( decl->stmts.get(), labelTable ) );
 }
 
-void FixLabelsCore::previsit( const Stmt * stmt ) {
+void FixLabelsCore::previsit( const ast::Stmt * stmt ) {
         if ( !stmt->labels.empty() ) {
                 setLabelsDef( stmt->labels, stmt );
@@ -61 +63 @@
 }
 
-void FixLabelsCore::previsit( const BranchStmt * stmt ) {
+void FixLabelsCore::previsit( const ast::BranchStmt * stmt ) {
         if ( !stmt->labels.empty() ) {
                 setLabelsDef( stmt->labels, stmt );
@@ -70 +72 @@
 }
 
-void FixLabelsCore::previsit( const LabelAddressExpr * expr ) {
+void FixLabelsCore::previsit( const ast::LabelAddressExpr * expr ) {
         assert( !expr->arg.empty() );
         setLabelsUsage( expr->arg );
@@ -76 +78 @@
 
 void FixLabelsCore::setLabelsDef(
-        const std::vector<Label> & labels, const Stmt * stmt ) {
+                const std::vector<ast::Label> & labels, const ast::Stmt * stmt ) {
         assert( !labels.empty() );
         assert( stmt );
@@ -87 +89 @@
                         // Duplicate definition, this is an error.
                         SemanticError( label.location,
-                                                   "Duplicate definition of label: " + label.name );
+                                "Duplicate definition of label: " + label.name );
                 } else {
                         // Perviously used, but not defined until now.
@@ -96 +98 @@
 
 // Label was used, if it is new add it to the table.
-void FixLabelsCore::setLabelsUsage( const Label & label ) {
+void FixLabelsCore::setLabelsUsage( const ast::Label & label ) {
         if ( labelTable.find( label ) == labelTable.end() ) {
                 labelTable[ label ] = nullptr;
@@ -102 +104 @@
 }
 
-void fixLabels( TranslationUnit & translationUnit ) {
-        Pass<FixLabelsCore>::run( translationUnit );
+} // namespace
+
+void fixLabels( ast::TranslationUnit & translationUnit ) {
+        ast::Pass<FixLabelsCore>::run( translationUnit );
 }
+
 } // namespace ControlStruct