Changeset 70ac8d0 for tests/exceptions

Timestamp:

May 12, 2020, 4:55:42 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

068a202, f2d05e9

Parents:

5c581cc (diff), 730f4f1 (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/resume.txt (modified) (1 diff)
• .expect/terminate.txt (modified) (1 diff)
• data-except.cfa (modified) (1 diff)
• resume.cfa (modified) (1 diff)
• terminate.cfa (modified) (1 diff)

tests/exceptions/.expect/resume.txt

@@ -4 +4 @@
 end of try clause
 Exiting: simple try clause
+
+catch-all
 
 throwing child exception

tests/exceptions/.expect/terminate.txt

@@ -3 +3 @@
 simple catch
 Exiting: simple catch clause
+
+catch-all
 
 throwing child exception

tests/exceptions/data-except.cfa

@@ -12 +12 @@
         this.first = first;
         this.second = second;
-}
-
-void copy(paired * this, paired * other) {
-        *this = *other;
 }
 

tests/exceptions/resume.cfa

@@ -19 +19 @@
                 loud_exit a = "simple catch clause";
                 printf("simple catch\n");
+        }
+        printf("\n");
+
+        // Throw catch-all test.
+        try {
+                throwResume &(zen){};
+        } catchResume (exception_t * error) {
+                printf("catch-all\n");
         }
         printf("\n");

tests/exceptions/terminate.cfa

@@ -17 +17 @@
                 printf("end of try clause\n");
         } catch (zen * error) {
-        loud_exit a = "simple catch clause";
+                loud_exit a = "simple catch clause";
                 printf("simple catch\n");
+        }
+        printf("\n");
+
+        // Throw catch-all test.
+        try {
+                throw &(zen){};
+        } catch (exception_t * error) {
+                printf("catch-all\n");
         }
         printf("\n");