Changeset e276be6 for tests/exceptions

Timestamp:

Apr 6, 2020, 8:50:45 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

9d5d01f

Parents:

23ecea4 (diff), f1b6671 (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/exceptions

Files:

• .expect/interact.txt (modified) (1 diff)
• .expect/resume.txt (modified) (1 diff)
• .expect/terminate.txt (modified) (1 diff)
• interact.cfa (modified) (2 diffs)
• resume.cfa (modified) (1 diff)
• terminate.cfa (modified) (1 diff)

tests/exceptions/.expect/interact.txt

@@ -14 +14 @@
 resumption catch, will terminate
 inner termination catch
+
+throwing resume moon
+resumption moon catch, will terminate
+termination catch
+throwing resume star
+resumption star catch

tests/exceptions/.expect/resume.txt

@@ -25 +25 @@
 caught second exception
 recaught first exception
+
+inner catch
+inner catch
+outer catch

tests/exceptions/.expect/terminate.txt

@@ -24 +24 @@
 caught second exception
 recaught first exception
+
+inner catch
+outer catch

tests/exceptions/interact.cfa

@@ -86 +86 @@
                 printf("outer terminate catch (error)\n");
         }
-#if 0
         printf("\n");
 
@@ -111 +110 @@
                 printf("outermost catch (error)\n");
         }
-#endif
 }

tests/exceptions/resume.cfa

@@ -99 +99 @@
                 printf("caught second exception (bad location)\n");
         }
+        printf("\n");
+
+        // Check successive operations.
+        try {
+                try {
+                        THROW_RESUME(&(zen){});
+                        THROW_RESUME(&(zen){});
+                } catchResume (zen *) {
+                        printf("inner catch\n");
+                }
+                THROW_RESUME(&(zen){});
+        } catchResume (zen *) {
+                printf("outer catch\n");
+        }
 }

tests/exceptions/terminate.cfa

@@ -99 +99 @@
                 printf("caught second exception (bad location)\n");
         }
+        printf("\n");
+
+        // Check successive operations.
+        try {
+                try {
+                        THROW(&(zen){});
+                        THROW(&(zen){});
+                } catch (zen *) {
+                        printf("inner catch\n");
+                }
+                THROW(&(zen){});
+        } catch (zen *) {
+                printf("outer catch\n");
+        }
 }