Changes in tests/exceptions/data-except.cfa [ecfd758:046a890]

File:

• tests/exceptions/data-except.cfa (modified) (1 diff)

tests/exceptions/data-except.cfa

@@ -3 +3 @@
 #include <exception.hfa>
 
-EHM_EXCEPTION(paired)(
+DATA_EXCEPTION(paired)(
         int first;
         int second;
 );
 
-EHM_VIRTUAL_TABLE(paired, paired_vt);
+void ?{}(paired & this, int first, int second) {
+        VTABLE_INIT(this, paired);
+        this.first = first;
+        this.second = second;
+}
 
-const char * virtual_msg(paired * this) {
-        return this->virtual_table->msg(this);
+const char * paired_msg(paired * this) {
+        return "paired";
+}
+
+VTABLE_INSTANCE(paired)(paired_msg);
+
+void throwPaired(int first, int second) {
+        paired exc = {first, second};
 }
 
 int main(int argc, char * argv[]) {
-        paired except = {&paired_vt, 3, 13};
+        paired except = {3, 13};
 
         try {
                 throw except;
         } catch (paired * exc) {
-                printf("%s(%d, %d)\n", virtual_msg(exc), exc->first, exc->second);
+                printf("%s(%d, %d)\n", paired_msg(exc), exc->first, exc->second);
                 ++exc->first;
         }
 
-        printf("%s(%d, %d)\n", virtual_msg(&except), except.first, except.second);
+        printf("%s(%d, %d)\n", paired_msg(&except), except.first, except.second);
 
         try {
                 throwResume except;
         } catchResume (paired * exc) {
-                printf("%s(%d, %d)\n", virtual_msg(exc), exc->first, exc->second);
+                printf("%s(%d, %d)\n", paired_msg(exc), exc->first, exc->second);
                 ++exc->first;
         }
 
-        printf("%s(%d, %d)\n", virtual_msg(&except), except.first, except.second);
+        printf("%s(%d, %d)\n", paired_msg(&except), except.first, except.second);
 }