Added eq function to cspan.

Final cleanup normalized var naming.

1 files changed, 14 insertions, 1 deletions

diff --git a/include/stc/cspan.h b/include/stc/cspan.h
index bbaaf6c0..506702b3 100644
--- a/include/stc/cspan.h
+++ b/include/stc/cspan.h
@@ -61,14 +61,20 @@ int demo2() {
 #include "ccommon.h"
 
 #define using_cspan(...) c_MACRO_OVERLOAD(using_cspan, __VA_ARGS__)
-#define using_cspan_2(Self, T) using_cspan_3(Self, T, 1)
+#define using_cspan_2(Self, T) \
+    using_cspan_3(Self, T, 1)
+
 #define using_cspan_3(Self, T, RANK) \
+    using_cspan_4(Self, T, RANK, c_default_eq)
+
+#define using_cspan_4(Self, T, RANK, i_eq) \
     typedef T Self##_value; typedef T Self##_raw; \
     typedef struct { \
         Self##_value *data; \
         int32_t shape[RANK]; \
         cspan_idx##RANK stride; \
     } Self; \
+    \
     typedef struct { Self##_value *ref; int32_t pos[RANK]; const Self *_s; } Self##_iter; \
     \
     STC_INLINE Self Self##_from_n(Self##_raw* raw, const intptr_t n) { \
@@ -93,6 +99,13 @@ int demo2() {
         it->ref += _cspan_next##RANK(RANK, it->pos, it->_s->shape, it->_s->stride.d); \
         if (it->pos[0] == it->_s->shape[0]) it->ref = NULL; \
     } \
+    STC_INLINE bool Self##_eq(const Self* x, const Self* y) { \
+        if (memcmp(x->shape, y->shape, sizeof x->shape)) return false; \
+        Self##_iter i = Self##_begin(x), j = Self##_begin(y); \
+        for (; i.ref; Self##_next(&i), Self##_next(&j)) \
+            if (!(i_eq(i.ref, j.ref))) return false; \
+        return true; \
+    } \
     struct stc_nostruct
 
 #define using_cspan2(Self, T) using_cspan_3(Self, T, 1); using_cspan_3(Self##2, T, 2)