From 18de7e809d470c84fec9c420133e3a5a036a4239 Mon Sep 17 00:00:00 2001
From: Tyge Løvset <tylo@norceresearch.no>
Date: Tue, 1 Jun 2021 20:46:09 +0200
Subject: 1. Added c_forscope() macro. Similar to c_forvar() and c_fordefer().
 2. Added *experimental* forward declare for cvec: No API changes:

typedef struct person Person;

// forward declare cvec_prs
forward_cvec(prs, Person);
...
// complete definition: specify c_false as very last parameter.
using_cvec(prs, Person, c_no_compare, person_del, person_clone, c_default_toraw, Person, c_false);
---
 include/stc/ccommon.h |  3 ++-
 include/stc/cvec.h    | 22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/stc/ccommon.h b/include/stc/ccommon.h
index d15d5951..a650d6d8 100644
--- a/include/stc/ccommon.h
+++ b/include/stc/ccommon.h
@@ -123,8 +123,9 @@
     for (type i=start, _c_inc=step, _c_end=(stop) - (0 < _c_inc) \
          ; (i <= _c_end) == (0 < _c_inc); i += _c_inc)
 
-#define c_forvar(acquire, ...) for (acquire, *_c_ii = NULL; !_c_ii; ++_c_ii, __VA_ARGS__)
+#define c_forvar(declvar, ...) for (declvar, *_c_ii = NULL; !_c_ii; ++_c_ii, __VA_ARGS__)
 #define c_arg(...) __VA_ARGS__
+#define c_forscope(start, end) for (int _c_ii = (start, 0); !_c_ii; ++_c_ii, end)
 #define c_fordefer(...) for (int _c_ii = 0; !_c_ii; ++_c_ii, __VA_ARGS__)
 
 #define c_forbuffer(b, type, n) c_forbuffer_N(b, type, n, 256)
diff --git a/include/stc/cvec.h b/include/stc/cvec.h
index 3e7e37f2..02537081 100644
--- a/include/stc/cvec.h
+++ b/include/stc/cvec.h
@@ -27,6 +27,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define forward_cvec(X, Value) _cvec_types(cvec_##X, Value)
+
 #define using_cvec(...) c_MACRO_OVERLOAD(using_cvec, __VA_ARGS__)
 
 #define using_cvec_2(X, Value) \
@@ -38,22 +40,28 @@
 #define using_cvec_5(X, Value, valueCompare, valueDel, valueClone) \
             using_cvec_7(X, Value, valueCompare, valueDel, valueClone, c_default_toraw, Value)
 #define using_cvec_7(X, Value, valueCompareRaw, valueDel, valueFromRaw, valueToRaw, RawValue) \
-            _c_using_cvec(cvec_##X, Value, valueCompareRaw, valueDel, valueFromRaw, valueToRaw, RawValue)
+            _c_using_cvec(cvec_##X, Value, valueCompareRaw, valueDel, valueFromRaw, valueToRaw, RawValue, c_true)
+#define using_cvec_8(X, Value, valueCompareRaw, valueDel, valueFromRaw, valueToRaw, RawValue, defineTypes) \
+            _c_using_cvec(cvec_##X, Value, valueCompareRaw, valueDel, valueFromRaw, valueToRaw, RawValue, defineTypes)
 
 #define using_cvec_str() \
-            _c_using_cvec(cvec_str, cstr, c_rawstr_compare, cstr_del, cstr_from, cstr_toraw, const char*)
-
+            using_cvec_7(str, cstr, c_rawstr_compare, cstr_del, cstr_from, cstr_toraw, const char*)
 
 struct cvec_rep { size_t size, cap; void* data[]; };
 #define _cvec_rep(self) c_container_of((self)->data, struct cvec_rep, data)
 
+#define c_true(...)  __VA_ARGS__
+#define c_false(...)
 
-#define _c_using_cvec(CX, Value, valueCompareRaw, valueDel, valueFromRaw, valueToRaw, RawValue) \
-\
+#define _cvec_types(CX, Value) \
     typedef Value CX##_value_t; \
+    typedef struct { CX##_value_t *ref; } CX##_iter_t; \
+    typedef struct { CX##_value_t *data; } CX
+
+#define _c_using_cvec(CX, Value, valueCompareRaw, valueDel, valueFromRaw, valueToRaw, RawValue, defineTypes) \
+\
+    defineTypes( _cvec_types(CX, Value); ) \
     typedef RawValue CX##_rawvalue_t; \
-    typedef struct {CX##_value_t *ref;} CX##_iter_t; \
-    typedef struct {CX##_value_t *data;} CX; \
 \
     STC_API CX              CX##_init(void); \
     STC_API CX              CX##_clone(CX cx); \
-- 
cgit v1.2.3