Changeset 69c5c00 for libcfa/src/exception.hfa

Timestamp:

Oct 7, 2020, 6:08:35 PM (5 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:

6fbe9a5

Parents:

41b8ea4

Message:

Rework exceptions mark_exception -> get_exception_vtable and the needed follow up.

File:

• libcfa/src/exception.hfa (modified) (5 diffs)

libcfa/src/exception.hfa

@@ -95 +95 @@
 // visible anywhere you use the instantiation of the exception is used.
 #define POLY_VTABLE_DECLARATION(exception_name, ...) \
-        void mark_exception(exception_name(__VA_ARGS__) *); \
+        VTABLE_TYPE(exception_name)(__VA_ARGS__) const & get_exception_vtable(exception_name(__VA_ARGS__) *); \
         extern VTABLE_TYPE(exception_name)(__VA_ARGS__) VTABLE_NAME(exception_name)
 
@@ -160 +160 @@
 
 #define _FORALL_CTOR0_DECLARATION(exception_name, assertions, parameters) \
-        forall(_UNPACK assertions | VTABLE_ASSERTION(exception_name, parameters) ) \
+        forall(_UNPACK assertions | \
+                is_exception(exception_name parameters, VTABLE_TYPE(exception_name) parameters)) \
         void ?{}(exception_name parameters & this)
 
 #define _FORALL_CTOR0_INSTANCE(exception_name, assertions, parameters) \
         _FORALL_CTOR0_DECLARATION(exception_name, assertions, parameters) { \
-                VTABLE_INIT(this, exception_name); \
+                (this).virtual_table = &get_exception_vtable(&this); \
         }
 
@@ -185 +186 @@
 #define _VTABLE_DECLARATION(exception_name, parent_name, ...) \
         struct exception_name; \
-        void mark_exception(exception_name *); \
         VTABLE_TYPE(exception_name); \
+        VTABLE_TYPE(exception_name) const & get_exception_vtable(exception_name *); \
         extern VTABLE_TYPE(exception_name) VTABLE_NAME(exception_name); \
         VTABLE_TYPE(exception_name) { \
@@ -197 +198 @@
 
 #define _VTABLE_INSTANCE(exception_name, parent_name, ...) \
-        void mark_exception(exception_name *) {} \
+        VTABLE_TYPE(exception_name) const & get_exception_vtable(exception_name *) { \
+                return VTABLE_NAME(exception_name); \
+        } \
         void _GLUE2(exception_name,_copy)(exception_name * this, exception_name * other) { \
                 *this = *other; \
@@ -218 +221 @@
 
 #define _POLY_VTABLE_INSTANCE(exception_name, parent_name, ...) \
-        void mark_exception(exception_name(__VA_ARGS__) *) {} \
+        extern VTABLE_TYPE(exception_name)(__VA_ARGS__) VTABLE_NAME(exception_name); \
+        VTABLE_TYPE(exception_name)(__VA_ARGS__) const & get_exception_vtable( \
+                        exception_name(__VA_ARGS__) *) { \
+                return VTABLE_NAME(exception_name); \
+        } \
         void _GLUE2(exception_name,_copy)( \
                         exception_name(__VA_ARGS__) * this, exception_name(__VA_ARGS__) * other) { \