Changes in / [1842167:f107afe]

Files:

• src/ControlStruct/MultiLevelExit.cpp (modified) (4 diffs)
• tests/ctrl-flow/.expect/break-misc.txt (added)
• tests/ctrl-flow/break-misc.cfa (added)
• tests/exceptions/.expect/try-ctrl-flow.txt (modified) (2 diffs)

src/ControlStruct/MultiLevelExit.cpp

@@ -84 +84 @@
         bool isFallDefaultTarget() const { return kind == SwitchStmtK; }
 
+        // Check if this entry can be the target of an unlabelled break.
+        bool isUnlabelledBreakTarget() const { return kind <= WhileDoStmtK || kind == SwitchStmtK; }
+
         // These routines set a target as being "used" by a BranchStmt
         Label useContExit() { assert( kind <= WhileDoStmtK ); return useTarget(secondTarget); }
@@ -114 +117 @@
 bool isFallthroughDefaultTarget( const Entry & entry ) {
         return entry.isFallDefaultTarget();
+}
+
+bool isUnlabelledBreakTarget( const Entry & entry ) {
+        return entry.isUnlabelledBreakTarget();
 }
 
@@ -247 +254 @@
         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 unlabeled continue.
+                if ( isContinue && stmt->target.empty() ) {
+                        targetEntry = findEnclosingControlStructure( isContinueTarget );
+                        if ( targetEntry == enclosing_control_structures.rend() ) {
+                                SemanticError( stmt->location,
+                                               "\"continue\" outside a loop" );
                         }
-                        // Handle labeled break and continue.
+                // Handle unlabeled break.
+                } else if ( stmt->target.empty() ) {
+                        targetEntry = findEnclosingControlStructure( isUnlabelledBreakTarget );
+                        if ( targetEntry == enclosing_control_structures.rend() ) {
+                                SemanticError( stmt->location,
+                                               "\"break\" outside a loop or \"switch\"" );
+                        }
+                // Handle labeled break and continue.
                 } else {
                         // Lookup label in table to find attached control structure.
@@ -265 +275 @@
                                           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\""),
-                                                        " target must be an enclosing ", (isContinue ? "loop: " : "control structure: "),
-                                                        stmt->originalTarget ) );
+                        // Ensure that selected target is valid.
+                        if ( targetEntry == enclosing_control_structures.rend()
+                                        || ( isContinue ? !isContinueTarget( *targetEntry ) : !isBreakTarget( *targetEntry ) ) ) {
+                                SemanticError( stmt->location, toString( (isContinue ? "\"continue\"" : "\"break\""),
+                                               " target must be an enclosing ", (isContinue ? "loop: " : "control structure: "),
+                                               stmt->originalTarget ) );
+                        }
                 }
                 break;

tests/exceptions/.expect/try-ctrl-flow.txt

@@ -1 @@
-exceptions/try-ctrl-flow.cfa:7:1 error: "break" outside a loop, "switch", or labelled block
-exceptions/try-ctrl-flow.cfa:15:1 error: "break" outside a loop, "switch", or labelled block
-exceptions/try-ctrl-flow.cfa:23:1 error: "break" outside a loop, "switch", or labelled block
-exceptions/try-ctrl-flow.cfa:31:1 error: "continue" target must be an enclosing loop: 
+exceptions/try-ctrl-flow.cfa:7:1 error: "break" outside a loop or "switch"
+exceptions/try-ctrl-flow.cfa:15:1 error: "break" outside a loop or "switch"
+exceptions/try-ctrl-flow.cfa:23:1 error: "break" outside a loop or "switch"
+exceptions/try-ctrl-flow.cfa:31:1 error: "continue" outside a loop
 exceptions/try-ctrl-flow.cfa:48:1 error: "break" target must be an enclosing control structure: mainLoop
 exceptions/try-ctrl-flow.cfa:56:1 error: "continue" target must be an enclosing loop: mainLoop
-exceptions/try-ctrl-flow.cfa:65:1 error: "break" outside a loop, "switch", or labelled block
-exceptions/try-ctrl-flow.cfa:76:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:65:1 error: "break" outside a loop or "switch"
+exceptions/try-ctrl-flow.cfa:76:1 error: "break" outside a loop or "switch"
 exceptions/try-ctrl-flow.cfa:87:1 error: "fallthrough" must be enclosed in a "switch" or "choose"
 exceptions/try-ctrl-flow.cfa:98:1 error: "break" target must be an enclosing control structure: mainBlock
@@ -13 +13 @@
 exceptions/try-ctrl-flow.cfa:133:1 error: "return" may not appear in a finally clause
 exceptions/try-ctrl-flow.cfa:139:1 error: "return" may not appear in a finally clause
-exceptions/try-ctrl-flow.cfa:148:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:148:1 error: "break" outside a loop or "switch"
 exceptions/try-ctrl-flow.cfa:159:1 error: "return" may not appear in a try statement with a catch clause
 exceptions/try-ctrl-flow.cfa:187:1 error: "return" may not appear in a catchResume clause