Changes in / [b3f9684c:d4da6886]

Location:

libcfa/src

Files:

• concurrency/coroutine.hfa (modified) (1 diff)
• exception.hfa (modified) (2 diffs)

libcfa/src/concurrency/coroutine.hfa

@@ -37 +37 @@
 // Anything that implements this trait can be resumed.
 // Anything that is resumed is a coroutine.
-trait is_coroutine(dtype T | IS_RESUMPTION_EXCEPTION(CoroutineCancelled, (T))) {
+trait is_coroutine(dtype T
+                | is_resumption_exception(CoroutineCancelled(T),
+                        CoroutineCancelled_vtable(T))) {
         void main(T & this);
         $coroutine * get_coroutine(T & this);

libcfa/src/exception.hfa

@@ -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.
@@ -243 +234 @@
                 _GLUE2(exception_name,_copy), ^?{}, \
                 _CLOSE
-
-#define _IS_EXCEPTION(kind, exception_name, parameters, ...) \
-        kind(exception_name parameters, VTABLE_TYPE(exception_name) parameters)