Changes in tests/exceptions/interact.cfa [3eb5a478:e68d092]

File:

• tests/exceptions/interact.cfa (modified) (11 diffs)

tests/exceptions/interact.cfa

@@ -1 +1 @@
 // Testing Interactions Between Termination and Resumption
 
-#include "except-mac.hfa"
+#include <exception.hfa>
 #include "except-io.hfa"
 
@@ -10 +10 @@
         // Resume falls back to terminate.
         try {
-                THROW_RESUME(&(star){});
+                throwResume &(star){};
         } catch (star *) {
                 printf("caught as termination\n");
@@ -17 +17 @@
         try {
                 loud_region a = "try block with resume throw";
-                THROW_RESUME(&(star){});
+                throwResume &(star){};
         } catch (star *) {
                 printf("caught as termination\n");
@@ -29 +29 @@
         try {
                 try {
-                        THROW(&(star){});
+                        throw &(star){};
                 } catchResume (star *) {
                         printf("resume catch on terminate\n");
@@ -43 +43 @@
         try {
                 try {
-                        THROW_RESUME(&(star){});
+                        throwResume &(star){};
                 } catch (star *) {
                         printf("terminate catch on resume\n");
@@ -58 +58 @@
                 try {
                         try {
-                                THROW(&(star){});
+                                throw &(star){};
                         } catchResume (star *) {
                                 printf("inner resume catch (error)\n");
@@ -64 +64 @@
                 } catch (star * error) {
                         printf("termination catch, will resume\n");
-                        THROW_RESUME(error);
+                        throwResume error;
                 }
         } catchResume (star *) {
@@ -75 +75 @@
                 try {
                         try {
-                                THROW_RESUME(&(star){});
+                                throwResume &(star){};
                         } catch (star *) {
                                 printf("inner termination catch\n");
@@ -81 +81 @@
                 } catchResume (star * error) {
                         printf("resumption catch, will terminate\n");
-                        THROW(error);
+                        throw error;
                 }
         } catch (star *) {
                 printf("outer terminate catch (error)\n");
         }
-#if 0
         printf("\n");
 
@@ -95 +94 @@
                                 try {
                                         printf("throwing resume moon\n");
-                                        THROW_RESUME(&(moon){});
+                                        throwResume &(moon){};
                                 } catch (star *) {
                                         printf("termination catch\n");
                                 }
                                 printf("throwing resume star\n");
-                                THROW_RESUME(&(star){});
+                                throwResume &(star){};
                         } catchResume (star *) {
                                 printf("resumption star catch\n");
@@ -106 +105 @@
                 } catchResume (moon *) {
                         printf("resumption moon catch, will terminate\n");
-                        THROW(&(star){});
+                        throw &(star){};
                 }
         } catchResume (star *) {
                 printf("outermost catch (error)\n");
         }
-#endif
 }