Changes in tests/exceptions/conditional.cfa [ecfd758:afe2939]

File:

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

tests/exceptions/conditional.cfa

@@ -6 +6 @@
 #include <exception.hfa>
 
-EHM_EXCEPTION(num_error)(
-        int num;
+VTABLE_DECLARATION(num_error)(
+        int (*code)(num_error *this);
 );
 
-EHM_VIRTUAL_TABLE(num_error, num_error_vt);
+struct num_error {
+        VTABLE_FIELD(num_error);
+    char * msg;
+    int num;
+};
+
+const char * num_error_msg(num_error * this) {
+    if ( ! this->msg ) {
+        static const char * base = "Num Error with code: X";
+        this->msg = (char *)malloc(22);
+        for (int i = 0 ; (this->msg[i] = base[i]) ; ++i);
+    }
+    this->msg[21] = '0' + this->num;
+    return this->msg;
+}
+void ?{}(num_error & this, int num) {
+        VTABLE_INIT(this, num_error);
+    this.msg = 0;
+    this.num = num;
+}
+void ?{}(num_error & this, num_error & other) {
+    this.virtual_table = other.virtual_table;
+    this.msg = 0;
+    this.num = other.num;
+}
+void ^?{}(num_error & this) {
+    if( this.msg ) free( this.msg );
+}
+int num_error_code( num_error * this ) {
+    return this->num;
+}
+
+VTABLE_INSTANCE(num_error)(
+        num_error_msg,
+        num_error_code,
+);
 
 void caught_num_error(int expect, num_error * actual) {
@@ -17 +52 @@
 
 int main(int argc, char * argv[]) {
-        num_error exc = {&num_error_vt, 2};
+        num_error exc = 2;
 
         try {
                 throw exc;
-        } catch (num_error * error ; 3 == error->num ) {
+        } catch (num_error * error ; 3 == error->virtual_table->code( error )) {
                 caught_num_error(3, error);
-        } catch (num_error * error ; 2 == error->num ) {
+        } catch (num_error * error ; 2 == error->virtual_table->code( error )) {
                 caught_num_error(2, error);
         }
@@ -29 +64 @@
         try {
                 throwResume exc;
-        } catchResume (num_error * error ; 3 == error->num ) {
+        } catchResume (num_error * error ; 3 == error->virtual_table->code( error )) {
                 caught_num_error(3, error);
-        } catchResume (num_error * error ; 2 == error->num ) {
+        } catchResume (num_error * error ; 2 == error->virtual_table->code( error )) {
                 caught_num_error(2, error);
         }