Changeset dafbde8 for tests/exceptions

Timestamp:

Jan 20, 2021, 4:49:40 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:

454f478

Parents:

92bfda0 (diff), fd54fef (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

Location:

tests/exceptions

Files:

• defaults.cfa (modified) (1 diff)
• polymorphic.cfa (modified) (2 diffs)
• virtual-poly.cfa (modified) (2 diffs)

tests/exceptions/defaults.cfa

@@ -55 +55 @@
 
 void unhandled_test(void) {
-        forall(dtype T, dtype V | is_exception(T, V))
+        forall(T &, V & | is_exception(T, V))
         void defaultTerminationHandler(T &) {
                 throw (unhandled_exception){};

tests/exceptions/polymorphic.cfa

@@ -3 +3 @@
 #include <exception.hfa>
 
-FORALL_TRIVIAL_EXCEPTION(proxy, (otype T), (T));
-FORALL_TRIVIAL_INSTANCE(proxy, (otype U), (U))
+FORALL_TRIVIAL_EXCEPTION(proxy, (T), (T));
+FORALL_TRIVIAL_INSTANCE(proxy, (U), (U))
 
 const char * msg(proxy(int) * this) { return "proxy(int)"; }
@@ -33 +33 @@
 }
 
-FORALL_DATA_EXCEPTION(cell, (otype T), (T))(
+FORALL_DATA_EXCEPTION(cell, (T), (T))(
         T data;
 );
 
-FORALL_DATA_INSTANCE(cell, (otype T), (T))
+FORALL_DATA_INSTANCE(cell, (T), (T))
 
 const char * msg(cell(int) * this) { return "cell(int)"; }

tests/exceptions/virtual-poly.cfa

@@ -16 +16 @@
 };
 
-forall(otype T)
+forall(T)
 struct mono_child_vtable {
         mono_base_vtable const * const parent;
 };
 
-forall(otype T)
+forall(T)
 struct mono_child {
         mono_child_vtable(T) const * virtual_table;
@@ -37 +37 @@
 }
 
-forall(otype U)
+forall(U)
 struct poly_base_vtable {
         poly_base_vtable(U) const * const parent;
 };
 
-forall(otype U)
+forall(U)
 struct poly_base {
         poly_base_vtable(U) const * virtual_table;
 };
 
-forall(otype V)
+forall(V)
 struct poly_child_vtable {
         poly_base_vtable(V) const * const parent;
 };
 
-forall(otype V)
+forall(V)
 struct poly_child {
         poly_child_vtable(V) const * virtual_table;