Changeset 5727c23

Timestamp:

Aug 5, 2020, 6:36:10 PM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

dd23e66

Parents:

97c3159

Message:

Fixed up the polymo{r}phic exception test. Some left over code hid an error on my machine.

Files:

• libcfa/src/exception.hfa (modified) (1 diff)
• tests/exceptions/.expect/polymorphic.txt (moved) (moved from tests/exceptions/.expect/polymophic.txt)
• tests/exceptions/polymorphic.cfa (moved) (moved from tests/exceptions/polymophic.cfa) (1 diff)

libcfa/src/exception.hfa

@@ -160 +160 @@
 
 #define _FORALL_CTOR0_DECLARATION(exception_name, assertions, parameters) \
-        forall(_UNPACK assertions | VTABLE_ASSERTION(exception_name, assertions, parameters) ) \
-                /*| { VTABLE_TYPE(exception_name) parameters VTABLE_NAME(exception_name); } ) */ \
+        forall(_UNPACK assertions | VTABLE_ASSERTION(exception_name, parameters) ) \
         void ?{}(exception_name parameters & this)
 

tests/exceptions/polymorphic.cfa

@@ -3 +3 @@
 #include <exception.hfa>
 
-FORALL_TRIVIAL_EXCEPTION_(proxy, (otype U3), (U3));
-FORALL_TRIVIAL_INSTANCE_(proxy, (otype U4), (U4))
+FORALL_TRIVIAL_EXCEPTION(proxy, (otype T), (T));
+FORALL_TRIVIAL_INSTANCE(proxy, (otype U), (U))
 
 const char * msg(proxy(int) * this) { return "proxy(int)"; }