Changes in tests/exceptions/terminate.cfa [ecfd758:5715d43]

File:

• tests/exceptions/terminate.cfa (modified) (8 diffs)

tests/exceptions/terminate.cfa

@@ -4 +4 @@
 #include "except-io.hfa"
 
-EHM_EXCEPTION(yin)();
-EHM_EXCEPTION(yang)();
-EHM_EXCEPTION(zen)();
-
-EHM_VIRTUAL_TABLE(yin, yin_vt);
-EHM_VIRTUAL_TABLE(yang, yang_vt);
-EHM_VIRTUAL_TABLE(zen, zen_vt);
+TRIVIAL_EXCEPTION(yin);
+TRIVIAL_EXCEPTION(yang);
+TRIVIAL_EXCEPTION(zen);
+TRIVIAL_EXCEPTION(moment_of, zen);
 
 void in_void(void);
 
 int main(int argc, char * argv[]) {
-        yin a_yin = {&yin_vt};
-        yang a_yang = {&yang_vt};
-        zen a_zen = {&zen_vt};
-
         // The simple throw catch test.
         try {
                 loud_exit a = "simple try clause";
                 printf("simple throw\n");
-                throw a_zen;
+                throw (zen){};
                 printf("end of try clause\n");
         } catch (zen * error) {
@@ -33 +26 @@
         // Throw catch-all test.
         try {
-                throw a_zen;
+                throw (zen){};
         } catch (exception_t * error) {
                 printf("catch-all\n");
+        }
+        printf("\n");
+
+        // Catch a parent of the given exception.
+        try {
+                printf("throwing child exception\n");
+                throw (moment_of){};
+        } catch (zen *) {
+                printf("inner parent match\n");
+        } catch (moment_of *) {
+                printf("outer exact match\n");
         }
         printf("\n");
@@ -42 +46 @@
         try {
                 try {
-                        throw a_yin;
+                        throw (yin){};
                 } catch (zen *) {
                         printf("caught yin as zen\n");
@@ -58 +62 @@
                         loud_exit a = "rethrow inner try";
                         printf("rethrow inner try\n");
-                        throw a_zen;
+                        throw (zen){};
                 } catch (zen *) {
                         loud_exit a = "rethrowing catch clause";
@@ -73 +77 @@
         try {
                 try {
-                        throw a_yin;
+                        throw (yin){};
                 } catch (yin *) {
                         printf("caught yin, will throw yang\n");
-                        throw a_yang;
+                        throw (yang){};
                 } catch (yang *) {
                         printf("caught exception from same try\n");
@@ -89 +93 @@
                 try {
                         printf("throwing first exception\n");
-                        throw a_yin;
+                        throw (yin){};
                 } catch (yin *) {
                         printf("caught first exception\n");
                         try {
                                 printf("throwing second exception\n");
-                                throw a_yang;
+                                throw (yang){};
                         } catch (yang *) {
                                 printf("caught second exception\n");
@@ -110 +114 @@
         try {
                 try {
-                        throw a_zen;
-                        throw a_zen;
+                        throw (zen){};
+                        throw (zen){};
                 } catch (zen *) {
                         printf("inner catch\n");
                 }
-                throw a_zen;
+                throw (zen){};
         } catch (zen *) {
                 printf("outer catch\n");
@@ -126 +130 @@
 // Do a throw and rethrow in a void function.
 void in_void(void) {
-        zen a_zen = {&zen_vt};
         try {
                 try {
                         printf("throw\n");
-                        throw a_zen;
+                        throw (zen){};
                 } catch (zen *) {
                         printf("rethrow\n");