Changes in src/tests/coroutine.c [5c81105:d9c44c3]

File:

• src/tests/coroutine.c (modified) (4 diffs)

src/tests/coroutine.c

@@ -3 +3 @@
 
 struct Fibonacci {
+      coroutine c;
+      coVtable v;
       int fn; // used for communication
-      covptr_t v;
-      coroutine c;
 };
 
+coroutine* this_coroutine(Fibonacci* this);
 void co_main(Fibonacci* this);
-covptr_t* vtable(Fibonacci* this);
+coVtable* vtable(Fibonacci* this);
 
-//GENERATED in proposal for virtuals
 void co_main_fib(void* this) {
       co_main( (Fibonacci*) this );
 }
 
-//GENERATED in proposal for virtuals
-static coVtable_t FibonacciVtable = {
-      co_main_fib,
-      VPTR_OFFSET(Fibonacci, v, c),
-      VPTR_OFFSET(Fibonacci, v, fn)      
-};
+coroutine* this_coroutine_fib(void* this) {
+      return this_coroutine( (Fibonacci*) this);
+}
 
 void ?{}(Fibonacci* this) {
       this->fn = 0;
-      this->v = &FibonacciVtable;  //GENERATED in proposal for virtuals
-      (&this->c) { &this->v };
+      this->v.main = co_main_fib;
+      this->v.this_coroutine = this_coroutine_fib;
+      start(this);
 }
 
@@ -32 +30 @@
 #ifdef MORE_DEBUG
       sout | "Starting main of coroutine " | this | endl;
-      sout | "Started from " | this->c.last | endl;
+      sout | "Started from " | this_coroutine(this)->last | endl;
 #endif
       int fn1, fn2;             // retained between resumes
@@ -57 +55 @@
 }
 
-covptr_t* vtable(Fibonacci* this) {
+coroutine* this_coroutine(Fibonacci* this) {
+      return &this->c;
+}
+
+coVtable* vtable(Fibonacci* this) {
       return &this->v;
 }
@@ -64 +66 @@
       Fibonacci f1, f2;
 #ifdef MORE_DEBUG      
-      Fibonacci *pf1 = &f1, *pf2 = &f2;
-      coroutine *cf1 = &f1.c, *cf2 = &f2.c;
-      covptr_t  *vf1 = vtable(pf1), *vf2 = vtable(pf2);
-      coroutine *cv1 = get_coroutine(vf1), *cv2 = get_coroutine(vf2);
-      Fibonacci *ov1 = (Fibonacci *)get_object(vf1), *ov2 = (Fibonacci *)get_object(vf2);
-
-      sout | "User coroutines : " | pf1 | ' ' | pf2 | endl;
-      sout | "Coroutine data  : " | cf1 | ' ' | cf2 | endl;
-      sout | "Vptr address    : " | vf1 | ' ' | vf2 | endl;
-      sout | "Vptr obj data   : " | ov1 | ' ' | ov2 | endl;
-      sout | "Vptr cor data   : " | cv1 | ' ' | cv2 | endl;
+      sout | "User coroutines : " | &f1 | ' ' | &f1 | endl;
 #endif
       for ( int i = 1; i <= 10; i += 1 ) {