Changeset 37eb41b

Timestamp:

Jan 31, 2022, 10:20:44 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

d7e9c12

Parents:

0fba0d4

Message:

formatting, remove anonymous namespace

Location:

src/ControlStruct

Files:

• FixLabels.cpp (modified) (8 diffs)
• FixLabels.hpp (modified) (2 diffs)

src/ControlStruct/FixLabels.cpp

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

src/ControlStruct/FixLabels.hpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Mon Nov  1 09:36:00 2021
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Nov  1 09:40:00 2021
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jan 31 22:18:43 2022
+// Update Count     : 2
 //
 
@@ -17 +17 @@
 
 namespace ast {
-        class TranslationUnit;
+class TranslationUnit;
 }
 
 namespace ControlStruct {
-
-/// normalizes label definitions and generates multi-level exit labels
+// normalizes label definitions and generates multi-level exit labels
 void fixLabels( ast::TranslationUnit & translationUnit );
-
 }