Changes in tests/exceptions/conditional.cfa [e68d092:6d43cdde]

File:

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

tests/exceptions/conditional.cfa

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