Changes in tests/exceptions/polymorphic.cfa [ecfd758:fd54fef]

File:

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

tests/exceptions/polymorphic.cfa

@@ -3 +3 @@
 #include <exception.hfa>
 
-EHM_FORALL_EXCEPTION(proxy, (T&), (T))();
+FORALL_TRIVIAL_EXCEPTION(proxy, (T), (T));
+FORALL_TRIVIAL_INSTANCE(proxy, (U), (U))
 
-EHM_FORALL_VIRTUAL_TABLE(proxy, (int), proxy_int);
-EHM_FORALL_VIRTUAL_TABLE(proxy, (char), proxy_char);
+const char * msg(proxy(int) * this) { return "proxy(int)"; }
+const char * msg(proxy(char) * this) { return "proxy(char)"; }
+POLY_VTABLE_INSTANCE(proxy, int)(msg);
+POLY_VTABLE_INSTANCE(proxy, char)(msg);
 
 void proxy_test(void) {
-        proxy(int) an_int = {&proxy_int};
-        proxy(char) a_char = {&proxy_char};
-
     try {
-                throw an_int;
+                throw (proxy(int)){};
         } catch (proxy(int) *) {
                 printf("terminate catch\n");
@@ -19 +19 @@
 
         try {
-                throwResume a_char;
+                throwResume (proxy(char)){};
         } catchResume (proxy(char) *) {
                 printf("resume catch\n");
@@ -25 +25 @@
 
         try {
-                throw a_char;
+                throw (proxy(char)){};
         } catch (proxy(int) *) {
                 printf("caught proxy(int)\n");
@@ -33 +33 @@
 }
 
-EHM_FORALL_EXCEPTION(cell, (T), (T))(
+FORALL_DATA_EXCEPTION(cell, (T), (T))(
         T data;
 );
 
-EHM_FORALL_VIRTUAL_TABLE(cell, (int), int_cell);
-EHM_FORALL_VIRTUAL_TABLE(cell, (char), char_cell);
-EHM_FORALL_VIRTUAL_TABLE(cell, (bool), bool_cell);
+FORALL_DATA_INSTANCE(cell, (T), (T))
+
+const char * msg(cell(int) * this) { return "cell(int)"; }
+const char * msg(cell(char) * this) { return "cell(char)"; }
+const char * msg(cell(bool) * this) { return "cell(bool)"; }
+POLY_VTABLE_INSTANCE(cell, int)(msg);
+POLY_VTABLE_INSTANCE(cell, char)(msg);
+POLY_VTABLE_INSTANCE(cell, bool)(msg);
 
 void cell_test(void) {
         try {
-                cell(int) except = {&int_cell, -7};
+                cell(int) except;
+                except.data = -7;
                 throw except;
         } catch (cell(int) * error) {
@@ -50 +56 @@
 
         try {
-                cell(bool) ball = {&bool_cell, false};
+                cell(bool) ball;
+                ball.data = false;
                 throwResume ball;
                 printf("%i\n", ball.data);