Changeset 491bb81

Timestamp:

May 12, 2022, 9:30:38 AM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

e5628db

Parents:

7675f58

Message:

Fixed some whitespace and indentation issues.

Location:

src

Files:

• AST/Stmt.hpp (modified) (2 diffs)
• ControlStruct/MultiLevelExit.cpp (modified) (3 diffs)

src/AST/Stmt.hpp

@@ -58 +58 @@
         // cannot be, they are sub-types of this type, for organization.
 
-    StmtClause( const CodeLocation & loc )
+        StmtClause( const CodeLocation & loc )
                 : ParseNode(loc) {}
 
@@ -396 +396 @@
 class WaitForClause final : public StmtClause {
   public:
-    ptr<Expr> target_func;
-    std::vector<ptr<Expr>> target_args;
-    ptr<Stmt> stmt;
-    ptr<Expr> cond;
-
-    WaitForClause( const CodeLocation & loc )
+        ptr<Expr> target_func;
+        std::vector<ptr<Expr>> target_args;
+        ptr<Stmt> stmt;
+        ptr<Expr> cond;
+
+        WaitForClause( const CodeLocation & loc )
                 : StmtClause( loc ) {}
 
         const WaitForClause * accept( Visitor & v ) const override { return v.visit( this ); }
   private:
-    WaitForClause * clone() const override { return new WaitForClause{ *this }; }
-    MUTATE_FRIEND
+        WaitForClause * clone() const override { return new WaitForClause{ *this }; }
+        MUTATE_FRIEND
 };
 

src/ControlStruct/MultiLevelExit.cpp

@@ -229 +229 @@
         // Labels on different stmts require different approaches to access
         switch ( stmt->kind ) {
-          case BranchStmt::Goto:
+        case BranchStmt::Goto:
                 return stmt;
-          case BranchStmt::Continue:
-          case BranchStmt::Break: {
-                  bool isContinue = stmt->kind == BranchStmt::Continue;
-                  // Handle unlabeled break and continue.
-                  if ( stmt->target.empty() ) {
-                          if ( isContinue ) {
-                                  targetEntry = findEnclosingControlStructure( isContinueTarget );
-                          } else {
-                                  if ( enclosing_control_structures.empty() ) {
+        case BranchStmt::Continue:
+        case BranchStmt::Break: {
+                bool isContinue = stmt->kind == BranchStmt::Continue;
+                // Handle unlabeled break and continue.
+                if ( stmt->target.empty() ) {
+                        if ( isContinue ) {
+                                targetEntry = findEnclosingControlStructure( isContinueTarget );
+                        } else {
+                                if ( enclosing_control_structures.empty() ) {
                                           SemanticError( stmt->location,
                                                                          "'break' outside a loop, 'switch', or labelled block" );
-                                  }
-                                  targetEntry = findEnclosingControlStructure( isBreakTarget );
-                          }
-                          // Handle labeled break and continue.
-                  } else {
-                          // Lookup label in table to find attached control structure.
-                          targetEntry = findEnclosingControlStructure(
-                                  [ targetStmt = target_table.at(stmt->target) ](auto entry){
+                                }
+                                targetEntry = findEnclosingControlStructure( isBreakTarget );
+                        }
+                        // Handle labeled break and continue.
+                } else {
+                        // Lookup label in table to find attached control structure.
+                        targetEntry = findEnclosingControlStructure(
+                                [ targetStmt = target_table.at(stmt->target) ](auto entry){
                                           return entry.stmt == targetStmt;
-                                  } );
-                  }
-                  // Ensure that selected target is valid.
-                  if ( targetEntry == enclosing_control_structures.rend() || ( isContinue && ! isContinueTarget( *targetEntry ) ) ) {
-                          SemanticError( stmt->location, toString( (isContinue ? "'continue'" : "'break'"),
+                                } );
+                }
+                // Ensure that selected target is valid.
+                if ( targetEntry == enclosing_control_structures.rend() || ( isContinue && ! isContinueTarget( *targetEntry ) ) ) {
+                        SemanticError( stmt->location, toString( (isContinue ? "'continue'" : "'break'"),
                                                         " target must be an enclosing ", (isContinue ? "loop: " : "control structure: "),
                                                         stmt->originalTarget ) );
-                  }
-                  break;
-          }
-          // handle fallthrough in case/switch stmts
-          case BranchStmt::FallThrough: {
-                  targetEntry = findEnclosingControlStructure( isFallthroughTarget );
-                  // Check that target is valid.
-                  if ( targetEntry == enclosing_control_structures.rend() ) {
-                          SemanticError( stmt->location, "'fallthrough' must be enclosed in a 'switch' or 'choose'" );
-                  }
-                  if ( ! stmt->target.empty() ) {
-                          // Labelled fallthrough: target must be a valid fallthough label.
-                          if ( ! fallthrough_labels.count( stmt->target ) ) {
-                                  SemanticError( stmt->location, toString( "'fallthrough' target must be a later case statement: ",
+                }
+                break;
+        }
+        // handle fallthrough in case/switch stmts
+        case BranchStmt::FallThrough: {
+                targetEntry = findEnclosingControlStructure( isFallthroughTarget );
+                // Check that target is valid.
+                if ( targetEntry == enclosing_control_structures.rend() ) {
+                        SemanticError( stmt->location, "'fallthrough' must be enclosed in a 'switch' or 'choose'" );
+                }
+                if ( ! stmt->target.empty() ) {
+                        // Labelled fallthrough: target must be a valid fallthough label.
+                        if ( ! fallthrough_labels.count( stmt->target ) ) {
+                                SemanticError( stmt->location, toString( "'fallthrough' target must be a later case statement: ",
                                                                                                                    stmt->originalTarget ) );
-                          }
-                          return new BranchStmt( stmt->location, BranchStmt::Goto, stmt->originalTarget );
-                  }
-                  break;
-          }
-          case BranchStmt::FallThroughDefault: {
-                  targetEntry = findEnclosingControlStructure( isFallthroughDefaultTarget );
-
-                  // Check if in switch or choose statement.
-                  if ( targetEntry == enclosing_control_structures.rend() ) {
-                          SemanticError( stmt->location, "'fallthrough' must be enclosed in a 'switch' or 'choose'" );
-                  }
-
-                  // Check if switch or choose has default clause.
-                  auto switchStmt = strict_dynamic_cast< const SwitchStmt * >( targetEntry->stmt );
-                  bool foundDefault = false;
-                  for ( auto caseStmt : switchStmt->cases ) {
-                          if ( caseStmt->isDefault() ) {
-                                  foundDefault = true;
-                                  break;
-                          }
-                  }
-                  if ( ! foundDefault ) {
-                          SemanticError( stmt->location, "'fallthrough default' must be enclosed in a 'switch' or 'choose'"
-                                                         "control structure with a 'default' clause" );
-                  }
-                  break;
-          }
-          default:
+                        }
+                        return new BranchStmt( stmt->location, BranchStmt::Goto, stmt->originalTarget );
+                }
+                break;
+        }
+        case BranchStmt::FallThroughDefault: {
+                targetEntry = findEnclosingControlStructure( isFallthroughDefaultTarget );
+
+                // Check if in switch or choose statement.
+                if ( targetEntry == enclosing_control_structures.rend() ) {
+                        SemanticError( stmt->location, "'fallthrough' must be enclosed in a 'switch' or 'choose'" );
+                }
+
+                // Check if switch or choose has default clause.
+                auto switchStmt = strict_dynamic_cast< const SwitchStmt * >( targetEntry->stmt );
+                bool foundDefault = false;
+                for ( auto caseStmt : switchStmt->cases ) {
+                        if ( caseStmt->isDefault() ) {
+                                foundDefault = true;
+                                break;
+                        }
+                }
+                if ( ! foundDefault ) {
+                        SemanticError( stmt->location, "'fallthrough default' must be enclosed in a 'switch' or 'choose'"
+                                                   "control structure with a 'default' clause" );
+                }
+                break;
+        }
+        default:
                 assert( false );
         }
@@ -308 +308 @@
         Label exitLabel( CodeLocation(), "" );
         switch ( stmt->kind ) {
-          case BranchStmt::Break:
+        case BranchStmt::Break:
                 assert( ! targetEntry->useBreakExit().empty() );
                 exitLabel = targetEntry->useBreakExit();
                 break;
-          case BranchStmt::Continue:
+        case BranchStmt::Continue:
                 assert( ! targetEntry->useContExit().empty() );
                 exitLabel = targetEntry->useContExit();
                 break;
-          case BranchStmt::FallThrough:
+        case BranchStmt::FallThrough:
                 assert( ! targetEntry->useFallExit().empty() );
                 exitLabel = targetEntry->useFallExit();
                 break;
-          case BranchStmt::FallThroughDefault:
+        case BranchStmt::FallThroughDefault:
                 assert( ! targetEntry->useFallDefaultExit().empty() );
                 exitLabel = targetEntry->useFallDefaultExit();
@@ -328 +328 @@
                 }
                 break;
-          default:
+        default:
                 assert(0);
         }