Changeset e68d092 for tests/exceptions/conditional.cfa

Timestamp:

May 7, 2020, 11:25:15 AM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

8e16177, af7acb9

Parents:

d6566c1

Message:

Replaced my exception patch macros with a (hopefully temporary) addition to the standard libary, the same macros just cleaned up. See the exception tests for some example uses.

File:

• tests/exceptions/conditional.cfa (modified) (5 diffs)

tests/exceptions/conditional.cfa

@@ -4 +4 @@
 // up the non-trivial exception is reasonable to do.
 
-#include "except-mac.hfa"
+#include <exception.hfa>
 #include <stdio.h>
 
-DECLARE_EXCEPT(num_error, BASE_EXCEPT,
+VTABLE_DECLARATION(num_error)(
         int (*code)(num_error *this);
 );
@@ -36 +36 @@
     this.num = other.num;
 }
-void copy(num_error * this, num_error * other) {
-        *this = *other;
-}
 void ^?{}(num_error & this) {
     if( this.msg ) free( this.msg );
@@ -46 +43 @@
 }
 
-VTABLE_INSTANCE(num_error, BASE_EXCEPT, copy, ^?{},
-        num_error_msg, num_error_code
+VTABLE_INSTANCE(num_error)(
+        num_error_msg,
+        num_error_code,
 );
 
@@ -58 +56 @@
 
         try {
-                THROW(&exc);
+                throw &exc;
         } catch (num_error * error ; 3 == error->virtual_table->code( error )) {
                 caught_num_error(3, error);
@@ -66 +64 @@
 
         try {
-                THROW_RESUME(&exc);
+                throwResume &exc;
         } catchResume (num_error * error ; 3 == error->virtual_table->code( error )) {
                 caught_num_error(3, error);