Changeset f090750

Timestamp:

Jan 19, 2020, 4:16:41 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c12869e

Parents:

2316525 (diff), 96f5b30 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests

Files:

• .expect/except-finally-error.txt (modified) (1 diff)
• except-finally-error.cfa (modified) (2 diffs)

tests/.expect/except-finally-error.txt

@@ -1 +1 @@
 except-finally-error.cfa:7:1 error: 'break' outside a loop, 'switch', or labelled block
-except-finally-error.cfa:15:1 error: 'continue' target must be an enclosing loop: 
-except-finally-error.cfa:32:1 error: 'break' target must be an enclosing control structure: mainLoop
-except-finally-error.cfa:40:1 error: 'continue' target must be an enclosing loop: mainLoop
+except-finally-error.cfa:15:1 error: 'break' outside a loop, 'switch', or labelled block
+except-finally-error.cfa:23:1 error: 'break' outside a loop, 'switch', or labelled block
+except-finally-error.cfa:31:1 error: 'continue' target must be an enclosing loop: 
+except-finally-error.cfa:48:1 error: 'break' target must be an enclosing control structure: mainLoop
+except-finally-error.cfa:56:1 error: 'continue' target must be an enclosing loop: mainLoop
+except-finally-error.cfa:65:1 error: 'break' outside a loop, 'switch', or labelled block
+except-finally-error.cfa:76:1 error: 'break' outside a loop, 'switch', or labelled block
+except-finally-error.cfa:87:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
+except-finally-error.cfa:98:1 error: 'break' target must be an enclosing control structure: mainBlock
+except-finally-error.cfa:111:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
+except-finally-error.cfa:124:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'

tests/except-finally-error.cfa

@@ -8 +8 @@
                 }
         }
+}
+
+void for_break_in_finally() {
+        for (10) {
+                try {} finally {
+                        break;
+                }
+        }
+}
+
+void do_while_break_in_finally() {
+        do {
+                try {} finally {
+                        break;
+                }
+        } while (false);
 }
 
@@ -43 +59 @@
 }
 
+void switch_break_in_finally() {
+        switch (1) {
+        case 1:
+                try {} finally {
+                        break;
+                }
+        default:
+                break;
+        }
+}
+
+void choose_break_in_finally() {
+        choose (1) {
+        case 1:
+                try {} finally {
+                        break;
+                }
+        default:
+                break;
+        }
+}
+
+void choose_fallthru_in_finally() {
+        choose (1) {
+        case 1:
+                try {} finally {
+                        fallthru;
+                }
+        default:
+                break;
+        }
+}
+
+void labelled_choose_break_in_finally() {
+        mainBlock: choose (1) {
+        case 1:
+                try {} finally {
+                        break mainBlock;
+                }
+        case 2:
+                break;
+        default:
+                break;
+        }
+}
+
+void labelled_choose_fallthru_in_finally() {
+        mainBlock: choose (1) {
+        case 1:
+                try {} finally {
+                        fallthru mainBlock;
+                }
+        case 2:
+                break;
+        default:
+                break;
+        }
+}
+
+void choose_fallthru_default_in_finally() {
+        choose (1) {
+        case 1:
+                try {} finally {
+                        fallthru default;
+                }
+        default:
+                break;
+        }
+}
+
 void void_return_in_finally() {
         try {} finally {