Fixed issue with using i_prefix as indicator of cset/csset.

4 files changed, 23 insertions, 13 deletions

diff --git a/include/stc/cmap.h b/include/stc/cmap.h
index 587b3887..6cf535e1 100644
--- a/include/stc/cmap.h
+++ b/include/stc/cmap.h
@@ -60,9 +60,15 @@ typedef struct      { size_t idx; uint_fast8_t hx; } chash_bucket_t;
 

 #ifndef i_prefix

 #define i_prefix cmap_

-#define cx_MAP_ONLY c_true

-#define cx_SET_ONLY c_false

-#define cx_keyref(vp) (&(vp)->first)

+#endif

+#ifdef cx_isset

+  #define cx_MAP_ONLY c_false

+  #define cx_SET_ONLY c_true

+  #define cx_keyref(vp) (vp)

+#else

+  #define cx_MAP_ONLY c_true

+  #define cx_SET_ONLY c_false

+  #define cx_keyref(vp) (&(vp)->first)

 #endif

 #include "template.h"

 #ifndef i_fwd

@@ -373,8 +379,9 @@ cx_memb(_erase_entry)(Self* self, cx_value_t* _val) {
 }

 

 #endif // TEMPLATED IMPLEMENTATION

+#undef cx_isset

 #undef cx_keyref

 #undef cx_MAP_ONLY

 #undef cx_SET_ONLY

 #include "template.h"

-#define CMAP_H_INCLUDED
\ No newline at end of file
+#define CMAP_H_INCLUDED

diff --git a/include/stc/cset.h b/include/stc/cset.h
index 2861ce89..44e0808a 100644
--- a/include/stc/cset.h
+++ b/include/stc/cset.h
@@ -42,7 +42,5 @@ int main(void) {
 #ifndef i_prefix

 #define i_prefix cset_

 #endif

-#define cx_MAP_ONLY c_false

-#define cx_SET_ONLY c_true

-#define cx_keyref(vp) (vp)

+#define cx_isset

 #include "cmap.h"

diff --git a/include/stc/csmap.h b/include/stc/csmap.h
index e176fc58..48a537d9 100644
--- a/include/stc/csmap.h
+++ b/include/stc/csmap.h
@@ -61,9 +61,15 @@ struct csmap_rep { size_t root, disp, head, size, cap; void* nodes[]; };
 

 #ifndef i_prefix

 #define i_prefix csmap_

-#define cx_MAP_ONLY c_true

-#define cx_SET_ONLY c_false

-#define cx_keyref(vp) (&(vp)->first)

+#endif

+#ifdef cx_isset

+  #define cx_MAP_ONLY c_false

+  #define cx_SET_ONLY c_true

+  #define cx_keyref(vp) (vp)

+#else

+  #define cx_MAP_ONLY c_true

+  #define cx_SET_ONLY c_false

+  #define cx_keyref(vp) (&(vp)->first)

 #endif

 #include "template.h"

 

@@ -482,6 +488,7 @@ cx_memb(_del)(Self* self) {
 }

 

 #endif // IMPLEMENTATION

+#undef cx_isset

 #undef cx_keyref

 #undef cx_MAP_ONLY

 #undef cx_SET_ONLY

diff --git a/include/stc/csset.h b/include/stc/csset.h
index 19cf147c..d62526ec 100644
--- a/include/stc/csset.h
+++ b/include/stc/csset.h
@@ -45,7 +45,5 @@ int main(void) {
 #ifndef i_prefix

 #define i_prefix csset_

 #endif

-#define cx_MAP_ONLY c_false

-#define cx_SET_ONLY c_true

-#define cx_keyref(vp) (vp)

+#define cx_isset

 #include "csmap.h"