Changes in src/ControlStruct/MultiLevelExit.cpp [f75e25b:0577df2]

File:

• src/ControlStruct/MultiLevelExit.cpp (modified) (11 diffs)

src/ControlStruct/MultiLevelExit.cpp

@@ -18 +18 @@
 #include "AST/Pass.hpp"
 #include "AST/Stmt.hpp"
+#include "Common/CodeLocationTools.hpp"
 #include "LabelGeneratorNew.hpp"
 
@@ -148 +149 @@
 };
 
-NullStmt * labelledNullStmt(
-        const CodeLocation & cl, const Label & label ) {
+NullStmt * labelledNullStmt( const CodeLocation & cl, const Label & label ) {
         return new NullStmt( cl, vector<Label>{ label } );
 }
@@ -163 +163 @@
 
 const CompoundStmt * MultiLevelExitCore::previsit(
-        const CompoundStmt * stmt ) {
+                const CompoundStmt * stmt ) {
         visit_children = false;
 
@@ -188 +188 @@
 }
 
-size_t getUnusedIndex(
-        const Stmt * stmt, const Label & originalTarget ) {
+size_t getUnusedIndex( const Stmt * stmt, const Label & originalTarget ) {
         const size_t size = stmt->labels.size();
 
@@ -209 +208 @@
 }
 
-const Stmt * addUnused(
-        const Stmt * stmt, const Label & originalTarget ) {
+const Stmt * addUnused( const Stmt * stmt, const Label & originalTarget ) {
         size_t i = getUnusedIndex( stmt, originalTarget );
         if ( i == stmt->labels.size() ) {
@@ -228 +226 @@
         // 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 );
         }
@@ -307 +305 @@
         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();
@@ -327 +325 @@
                 }
                 break;
-          default:
+        default:
                 assert(0);
         }
@@ -355 +353 @@
 
 // Mimic what the built-in push_front would do anyways. It is O(n).
-void push_front(
-        vector<ptr<Stmt>> & vec, const Stmt * element ) {
+void push_front( vector<ptr<Stmt>> & vec, const Stmt * element ) {
         vec.emplace_back( nullptr );
         for ( size_t i = vec.size() - 1 ; 0 < i ; --i ) {
@@ -589 +586 @@
 
                 ptr<Stmt> else_stmt = nullptr;
-                Stmt * loop_kid = nullptr;
+                const Stmt * loop_kid = nullptr;
                 // check if loop node and if so add else clause if it exists
-                const WhileDoStmt * whilePtr = dynamic_cast<const WhileDoStmt *>(kid.get());
-                if ( whilePtr && whilePtr->else_) {
+                const WhileDoStmt * whilePtr = kid.as<WhileDoStmt>();
+                if ( whilePtr && whilePtr->else_ ) {
                         else_stmt = whilePtr->else_;
-                        WhileDoStmt * mutate_ptr = mutate(whilePtr);
-                        mutate_ptr->else_ = nullptr;
-                        loop_kid = mutate_ptr;
-                }
-                const ForStmt * forPtr = dynamic_cast<const ForStmt *>(kid.get());
-                if ( forPtr && forPtr->else_) {
+                        loop_kid = mutate_field( whilePtr, &WhileDoStmt::else_, nullptr );
+                }
+                const ForStmt * forPtr = kid.as<ForStmt>();
+                if ( forPtr && forPtr->else_ ) {
                         else_stmt = forPtr->else_;
-                        ForStmt * mutate_ptr = mutate(forPtr);
-                        mutate_ptr->else_ = nullptr;
-                        loop_kid = mutate_ptr;
+                        loop_kid = mutate_field( forPtr, &ForStmt::else_, nullptr );
                 }
 
@@ -633 +626 @@
         Pass<MultiLevelExitCore> visitor( labelTable );
         const CompoundStmt * ret = stmt->accept( visitor );
-        return ret;
+        // There are some unset code locations slipping in, possibly by Labels.
+        const Node * node = localFillCodeLocations( ret->location, ret );
+        return strict_dynamic_cast<const CompoundStmt *>( node );
 }
 } // namespace ControlStruct