Renamed algo/ccoro.h => algo/coroutine.h. Using cco_ as prefix. Changed ccoro_execute(c) => cco_begin(c); ... cco_end(); (was required).

3 files changed, 54 insertions, 52 deletions

diff --git a/include/stc/algo/ccoro.h b/include/stc/algo/coroutine.h
index 07f98bf4..b7ed895f 100644
--- a/include/stc/algo/ccoro.h
+++ b/include/stc/algo/coroutine.h
@@ -20,29 +20,30 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef STC_CCORO_INCLUDED
-#define STC_CCORO_INCLUDED
+#ifndef STC_COROUTINE_INCLUDED
+#define STC_COROUTINE_INCLUDED
 /*
 #include <stdio.h>
 #include <stdbool.h>
-#include <stc/algo/ccoro.h>
+#include <stc/algo/coroutine.h>
 
 struct iterate {
     int max_x;
     int max_y;
-    int ccoro_state; // required member
+    int cco_state; // required member
     int x;
     int y;
 };
 
 bool iterate(struct iterate* U) {
-    ccoro_execute(U,
+    cco_begin(U);
         for (U->x = 0; U->x < U->max_x; U->x++)
             for (U->y = 0; U->y < U->max_y; U->y++)
-                ccoro_yield (true);
+                cco_yield (true);
 
-        ccoro_final: puts("final");
-    );
+        cco_final:
+            puts("final");
+    cco_end(U);
     return false;
 }
 
@@ -52,40 +53,39 @@ int main(void) {
     while (iterate(&it))
     {
         printf("%d %d\n", it.x, it.y);
-        if (++n == 20) { iterate(ccoro_stop(&it)); break; }
+        if (++n == 20) { iterate(cco_stop(&it)); break; }
     }
     return 0;
 }
 */
 #include <stc/ccommon.h>
 
-#define ccoro_execute(c, ...) \
-     int* _state = &(c)->ccoro_state; \
+#define cco_begin(c) \
+     int* _state = &(c)->cco_state; \
      switch (*_state) { \
-        case 0:; __VA_ARGS__ break; \
-        default: assert(!"missing ccoro_finish: or illegal state"); \
-     } \
-     *_state = -2
+        case 0:
 
-#define ccoro_yield(ret) \
+#define cco_end() \
+        break; \
+        default: assert(!"missing cco_final: or illegal state"); \
+    } *_state = -2
+
+#define cco_yield(retval) \
     do { \
-        *_state = __LINE__; return ret; \
+        *_state = __LINE__; return retval; \
         case __LINE__:; \
     } while (0)
 
-#define ccoro_yield_call(...)  c_MACRO_OVERLOAD(ccoro_yield_call, __VA_ARGS__)
-#define ccoro_yield_call_2(c, subcoro) ccoro_yield_call_3(c, subcoro, )
-#define ccoro_yield_call_3(c, subcoro, ret) \
+#define cco_yield_coroutine(c, corocall, retval) \
     do { \
-        *_state = __LINE__; \
-        c_PASTE(co, __LINE__): \
-        subcoro; return ret; \
-        case __LINE__:; \
-        if (ccoro_alive(c)) goto c_PASTE(co, __LINE__); \
+        *_state = __LINE__; cco_reset(c); \
+        c_PASTE(cco, __LINE__): corocall; return retval; \
+        case __LINE__:; if (cco_alive(c)) goto c_PASTE(cco, __LINE__); \
     } while (0)
 
-#define ccoro_final case -1
-#define ccoro_stop(c) ((c)->ccoro_state = (c)->ccoro_state > 0 ? -1 : -2, c)
-#define ccoro_alive(c) ((c)->ccoro_state >= 0)
+#define cco_final case -1
+#define cco_stop(c) ((c)->cco_state = (c)->cco_state > 0 ? -1 : -2, c)
+#define cco_alive(c) ((c)->cco_state >= 0)
+#define cco_reset(c) ((c)->cco_state = 0)
 
 #endif
diff --git a/misc/examples/coread.c b/misc/examples/coread.c
index a3eac7f9..6b0bfb37 100644
--- a/misc/examples/coread.c
+++ b/misc/examples/coread.c
@@ -1,30 +1,30 @@
 #include <stc/cstr.h>
-#include <stc/algo/ccoro.h>
+#include <stc/algo/coroutine.h>
 #include <errno.h>
 
 // Read file line by line using coroutines:
 
 struct file_nextline {
     const char* filename;
-    int ccoro_state;
+    int cco_state;
     FILE* fp;
     cstr line;
 };
 
 cstr file_nextline(struct file_nextline* U)
 {
-    ccoro_execute(U,
+    cco_begin(U)
         U->fp = fopen(U->filename, "r");
         U->line = cstr_NULL;
 
         while (cstr_getline(&U->line, U->fp))
-            ccoro_yield (cstr_clone(U->line));
+            cco_yield(cstr_clone(U->line));
 
-        ccoro_final: // ccoro_final is needed to support ccoro_stop.
+        cco_final: // cco_final is needed to support cco_stop.
             printf("finish\n");
             cstr_drop(&U->line);
             fclose(U->fp);
-    );
+    cco_end();
     return cstr_NULL;
 }
 
@@ -33,11 +33,11 @@ int main(void) {
     struct file_nextline z = {__FILE__};
     int n = 0;
     do {
-        c_with (cstr line = file_nextline(&z), ccoro_alive(&z), cstr_drop(&line)) {
+        c_with (cstr line = file_nextline(&z), cco_alive(&z), cstr_drop(&line)) {
             printf("%3d %s\n", ++n, cstr_str(&line));
 
             // stop after 15 lines:
-            if (n == 15) file_nextline(ccoro_stop(&z));
+            if (n == 15) file_nextline(cco_stop(&z));
         }
-    } while (ccoro_alive(&z));
+    } while (cco_alive(&z));
 }
diff --git a/misc/examples/cosub.c b/misc/examples/coroutines.c
index 87dcb9a1..d3295102 100644
--- a/misc/examples/cosub.c
+++ b/misc/examples/coroutines.c
@@ -1,4 +1,4 @@
-#include <stc/algo/ccoro.h>
+#include <stc/algo/coroutine.h>
 #include <stdio.h>
 #include <stdint.h>
 
@@ -8,24 +8,24 @@ typedef long long intll_t;
 
 struct fibonacci {
     int n; 
-    int ccoro_state;
+    int cco_state;
     intll_t a, b, idx;
 };
 
 intll_t fibonacci(struct fibonacci* F) {
     assert (F->n < 95);
 
-    ccoro_execute(F,
+    cco_begin(F);
         F->a = 0;
         F->b = 1;
         for (F->idx = 0; F->idx < F->n; F->idx++) {
-            ccoro_yield (F->a);
-            intll_t sum = F->a + F->b; // NB! locals only lasts until next ccoro_yield!
+            cco_yield(F->a);
+            intll_t sum = F->a + F->b; // NB! locals only lasts until next cco_yield!
             F->a = F->b;
             F->b = sum;
         }
-        ccoro_final:
-    );
+        cco_final:
+    cco_end();
 
     return -1;
 }
@@ -35,20 +35,22 @@ intll_t fibonacci(struct fibonacci* F) {
 
 struct iterate {
     int max_x, max_y; 
-    int ccoro_state; 
+    int cco_state; 
     int x, y;
 };
 
 bool iterate(struct iterate* I, struct fibonacci* F) {
-    ccoro_execute(I,
-        for (I->x = 0; I->x < I->max_x; I->x++)
-            for (I->y = 0; I->y < I->max_y; I->y++)
+    cco_begin(I);
+        for (I->x = 0; I->x < I->max_x; I->x++) {
+            for (I->y = 0; I->y < I->max_y; I->y++) {
                 if (I->x == 1 && I->y == 1)
-                    ccoro_yield_call (F, fibonacci(F), true);
+                    cco_yield_coroutine(F, fibonacci(F), true);
                 else
-                    ccoro_yield (true);
-        ccoro_final:
-    );
+                    cco_yield(true);
+            }
+        }
+        cco_final:
+    cco_end();
     return false;
 }