Changeset fe63ae6 for tests/exceptions/data-except.cfa

Timestamp:

Apr 12, 2021, 5:16:45 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a1b9bc3

Parents:

56c8b86 (diff), 73f4d08 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

tests/exceptions/data-except.cfa

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