Changes in libcfa/src/exception.hfa [8fc9a5f:1c01c58]

File:

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

libcfa/src/exception.hfa

@@ -95 +95 @@
 // visible anywhere you use the instantiation of the exception is used.
 #define POLY_VTABLE_DECLARATION(exception_name, ...) \
-        VTABLE_TYPE(exception_name)(__VA_ARGS__) const & get_exception_vtable(exception_name(__VA_ARGS__) *); \
+        void mark_exception(exception_name(__VA_ARGS__) *); \
         extern VTABLE_TYPE(exception_name)(__VA_ARGS__) VTABLE_NAME(exception_name)
 
@@ -125 +125 @@
 #define VTABLE_ASSERTION(exception_name, parameters) \
         { VTABLE_TYPE(exception_name) parameters VTABLE_NAME(exception_name); }
-
-// IS_EXCEPTION(exception_name [, (...parameters)])
-// IS_RESUMPTION_EXCEPTION(exception_name [, (parameters...)])
-// IS_TERMINATION_EXCEPTION(exception_name [, (parameters...)])
-// Create an assertion that exception_name, possibly with the qualifing parameters, is the given
-// kind of exception with the standard vtable with the same parameters if applicable.
-#define IS_EXCEPTION(...) _IS_EXCEPTION(is_exception, __VA_ARGS__, , ~)
-#define IS_RESUMPTION_EXCEPTION(...) _IS_EXCEPTION(is_resumption_exception, __VA_ARGS__, , ~)
-#define IS_TERMINATION_EXCEPTION(...) _IS_EXCEPTION(is_termination_exception, __VA_ARGS__, , ~)
 
 // All internal helper macros begin with an underscore.
@@ -169 +160 @@
 
 #define _FORALL_CTOR0_DECLARATION(exception_name, assertions, parameters) \
-        forall(_UNPACK assertions | \
-                is_exception(exception_name parameters, VTABLE_TYPE(exception_name) parameters)) \
+        forall(_UNPACK assertions | VTABLE_ASSERTION(exception_name, parameters) ) \
         void ?{}(exception_name parameters & this)
 
 #define _FORALL_CTOR0_INSTANCE(exception_name, assertions, parameters) \
         _FORALL_CTOR0_DECLARATION(exception_name, assertions, parameters) { \
-                (this).virtual_table = &get_exception_vtable(&this); \
+                VTABLE_INIT(this, exception_name); \
         }
 
@@ -195 +185 @@
 #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) { \
@@ -207 +197 @@
 
 #define _VTABLE_INSTANCE(exception_name, parent_name, ...) \
-        VTABLE_TYPE(exception_name) const & get_exception_vtable(exception_name *) { \
-                return VTABLE_NAME(exception_name); \
-        } \
+        void mark_exception(exception_name *) {} \
         void _GLUE2(exception_name,_copy)(exception_name * this, exception_name * other) { \
                 *this = *other; \
@@ -230 +218 @@
 
 #define _POLY_VTABLE_INSTANCE(exception_name, parent_name, ...) \
-        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 mark_exception(exception_name(__VA_ARGS__) *) {} \
         void _GLUE2(exception_name,_copy)( \
                         exception_name(__VA_ARGS__) * this, exception_name(__VA_ARGS__) * other) { \
@@ -243 +227 @@
                 _GLUE2(exception_name,_copy), ^?{}, \
                 _CLOSE
-
-#define _IS_EXCEPTION(kind, exception_name, parameters, ...) \
-        kind(exception_name parameters, VTABLE_TYPE(exception_name) parameters)