Changeset 8e4bc30 for libcfa/src/concurrency/coroutine.hfa

Timestamp:

Oct 8, 2020, 12:45:43 PM (5 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:

8fc9a5f, baee756

Parents:

391c065 (diff), 6fbe9a5 (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

File:

• libcfa/src/concurrency/coroutine.hfa (modified) (3 diffs)

libcfa/src/concurrency/coroutine.hfa

@@ -22 +22 @@
 //-----------------------------------------------------------------------------
 // Exception thrown from resume when a coroutine stack is cancelled.
-// Should not have to be be sized (see trac #196).
-FORALL_DATA_EXCEPTION(CoroutineCancelled,
-                (dtype coroutine_t | sized(coroutine_t)), (coroutine_t)) (
+FORALL_DATA_EXCEPTION(CoroutineCancelled, (dtype coroutine_t), (coroutine_t)) (
         coroutine_t * the_coroutine;
         exception_t * the_exception;
@@ -30 +28 @@
 
 forall(dtype T)
-void mark_exception(CoroutineCancelled(T) *);
-
-forall(dtype T | sized(T))
 void copy(CoroutineCancelled(T) * dst, CoroutineCancelled(T) * src);
 
@@ -42 +37 @@
 // Anything that implements this trait can be resumed.
 // Anything that is resumed is a coroutine.
-trait is_coroutine(dtype T | sized(T)
-                | is_resumption_exception(CoroutineCancelled(T))
-                | VTABLE_ASSERTION(CoroutineCancelled, (T))) {
+trait is_coroutine(dtype T
+                | is_resumption_exception(CoroutineCancelled(T),
+                        CoroutineCancelled_vtable(T))) {
         void main(T & this);
         $coroutine * get_coroutine(T & this);