Changeset ecfd758 for tests/exceptions/cancel

Timestamp:

Apr 9, 2021, 2:11:43 PM (5 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.

Location:

tests/exceptions/cancel

Files:

• coroutine.cfa (modified) (3 diffs)
• thread.cfa (modified) (4 diffs)

tests/exceptions/cancel/coroutine.cfa

@@ -4 +4 @@
 #include <exception.hfa>
 
-TRIVIAL_EXCEPTION(internal_error);
+EHM_EXCEPTION(internal_error)();
+EHM_VIRTUAL_TABLE(internal_error, internal_vt);
 
 coroutine WillCancel {};
@@ -14 +15 @@
 void main(WillCancel & wc) {
         printf("1");
-        cancel_stack((internal_error){});
+        cancel_stack((internal_error){&internal_vt});
         printf("!");
 }
@@ -24 +25 @@
                 resume(cancel);
                 printf("4");
-        } catchResume (CoroutineCancelled(WillCancel) * error) {
+        } catchResume (SomeCoroutineCancelled * error) {
                 printf("2");
                 if ((virtual internal_error *)error->the_exception) {

tests/exceptions/cancel/thread.cfa

@@ -4 +4 @@
 #include <exception.hfa>
 
-TRIVIAL_EXCEPTION(internal_error);
+EHM_EXCEPTION(internal_error)();
+EHM_VIRTUAL_TABLE(internal_error, internal_vt);
 
 thread WillCancel {};
@@ -14 +15 @@
 void main(WillCancel &) {
         printf("1");
-        cancel_stack((internal_error){});
+        cancel_stack((internal_error){&internal_vt});
         printf("!");
 }
@@ -25 +26 @@
                 join(cancel);
                 printf("4");
-        } catchResume (ThreadCancelled(WillCancel) * error) {
+        } catchResume (SomeThreadCancelled * error) {
                 printf("2");
                 if ((virtual internal_error *)error->the_exception) {
@@ -42 +43 @@
                 }
                 printf("4");
-        } catchResume (ThreadCancelled(WillCancel) * error) {
+        } catchResume (SomeThreadCancelled * error) {
                 printf("2");
                 if ((virtual internal_error *)error->the_exception) {