Changeset ecfd758 for tests/exceptions/polymorphic.cfa

Timestamp:

Apr 9, 2021, 2:11:43 PM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

b91bfde

Parents:

e07b589

Message:

Major exception update, seperating type-ids from virtual tables. The major interface changes are done. There is a regression of ?Cancelled(T) to Some?Cancelled. There is some bits of code for the new verion of the ?Cancelled(T) interface already there. Not connected yet but I just reached the limit of what I wanted to do in one commit and then spent over a day cleaning up, so it will replace Some?Cancelled in a future commit.

File:

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

tests/exceptions/polymorphic.cfa

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