Changeset ecfd758 for tests/exceptions/interact.cfa

Timestamp:

Apr 9, 2021, 2:11:43 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

b91bfde

Parents:

e07b589

Message:

Major exception update, seperating type-ids from virtual tables. The major interface changes are done. There is a regression of ?Cancelled(T) to Some?Cancelled. There is some bits of code for the new verion of the ?Cancelled(T) interface already there. Not connected yet but I just reached the limit of what I wanted to do in one commit and then spent over a day cleaning up, so it will replace Some?Cancelled in a future commit.

File:

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

tests/exceptions/interact.cfa

@@ -4 +4 @@
 #include "except-io.hfa"
 
-TRIVIAL_EXCEPTION(star);
-TRIVIAL_EXCEPTION(moon);
+EHM_EXCEPTION(star)();
+EHM_EXCEPTION(moon)();
+
+EHM_VIRTUAL_TABLE(star, star_vt);
+EHM_VIRTUAL_TABLE(moon, moon_vt);
 
 int main(int argc, char * argv[]) {
         // Resume falls back to terminate.
         try {
-                throwResume (star){};
+                throwResume (star){&star_vt};
         } catch (star *) {
                 printf("caught as termination\n");
@@ -17 +20 @@
         try {
                 loud_region a = "try block with resume throw";
-                throwResume (star){};
+                throwResume (star){&star_vt};
         } catch (star *) {
                 printf("caught as termination\n");
@@ -29 +32 @@
         try {
                 try {
-                        throw (star){};
+                        throw (star){&star_vt};
                 } catchResume (star *) {
                         printf("resume catch on terminate\n");
@@ -43 +46 @@
         try {
                 try {
-                        throwResume (star){};
+                        throwResume (star){&star_vt};
                 } catch (star *) {
                         printf("terminate catch on resume\n");
@@ -58 +61 @@
                 try {
                         try {
-                                throw (star){};
+                                throw (star){&star_vt};
                         } catchResume (star *) {
                                 printf("inner resume catch (error)\n");
@@ -75 +78 @@
                 try {
                         try {
-                                throwResume (star){};
+                                throwResume (star){&star_vt};
                         } catch (star *) {
                                 printf("inner termination catch\n");
@@ -94 +97 @@
                                 try {
                                         printf("throwing resume moon\n");
-                                        throwResume (moon){};
+                                        throwResume (moon){&moon_vt};
                                 } catch (star *) {
                                         printf("termination catch\n");
                                 }
                                 printf("throwing resume star\n");
-                                throwResume (star){};
+                                throwResume (star){&star_vt};
                         } catchResume (star *) {
                                 printf("resumption star catch\n");
@@ -105 +108 @@
                 } catchResume (moon *) {
                         printf("resumption moon catch, will terminate\n");
-                        throw (star){};
+                        throw (star){&star_vt};
                 }
         } catchResume (star *) {