Renamed i_more => i_retain (avoids undef of template parameters o…

…n next STC container inclusion).
stclib · Jun 20, 2023 · 3fed667 · 3fed667
1 parent de4f8fa
commit 3fed667
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/docs/ccommon_api.md b/docs/ccommon_api.md
@@ -222,11 +222,11 @@ int main() {
 }
 ```
 Containers with random access may also be sorted. Even sorting cdeq/cqueue (with ring buffer) is
-possible and very fast. Note that `i_more` must be defined to pick up template parameters from the container:
+possible and very fast. Note that `i_retain` must be defined to retain specified template parameters for use by sort:
 ```c
 #define i_type MyDeq
 #define i_val int
-#define i_more
+#define i_retain
 #include <stc/cdeq.h> // deque
 #include <stc/algo/sort.h>
 #include <stdio.h>

diff --git a/include/stc/algo/sort.h b/include/stc/algo/sort.h
@@ -26,20 +26,39 @@ template params:
 #define i_less          - less function. default: *x < *y
 #define i_type name     - define {{name}}_sort_n(), else {{i_val}}array_sort_n().
 
-// test:
+// ex1:
 #include <stdio.h>
 #define i_val int
 #include <stc/algo/sort.h>
 
 int main() {
     int nums[] = {23, 321, 5434, 25, 245, 1, 654, 33, 543, 21};
     
-    intarray_sort_n(nums, c_arraylen(arr));
+    intarray_sort_n(nums, c_arraylen(nums));
 
     for (int i = 0; i < c_arraylen(nums); i++)
         printf(" %d", nums[i]);
     puts("");
 }
+
+// ex2:
+#define i_val int
+#define i_type IDeq
+#define i_retain // retain input template params to be reused by sort.h
+#include <stc/cdeq.h>
+#include <stc/algo/sort.h>
+
+int main() {
+    IDeq nums = c_init(IDeq, {5434, 25, 245, 1, 654, 33, 543, 21});
+    IDeq_push_front(&nums, 23);
+    IDeq_push_front(&nums, 321);
+    
+    IDeq_sort_n(&nums, IDeq_size(&nums));
+
+    c_foreach (i, IDeq, nums)
+        printf(" %d", *i.ref);
+    IDeq_drop(&nums);
+}
 */
 #include "../ccommon.h"
 

diff --git a/include/stc/cdeq.h b/include/stc/cdeq.h
@@ -23,11 +23,11 @@
 #define _i_prefix cdeq_
 #define _pop _pop_front
 #define _pull _pull_front
-#ifdef i_more
+#ifdef i_retain
   #include "cqueue.h"
-  #define i_more
+  #define i_retain
 #else
-  #define i_more
+  #define i_retain
   #include "cqueue.h"
 #endif
 #undef _pop

diff --git a/include/stc/priv/template2.h b/include/stc/priv/template2.h
@@ -20,8 +20,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifdef i_more
-#undef i_more
+#ifdef i_retain
+#undef i_retain
 #else
 #undef i_type
 #undef i_tag

diff --git a/misc/benchmarks/various/csort_bench.c b/misc/benchmarks/various/csort_bench.c
@@ -8,7 +8,7 @@
 #define NDEBUG
 #define i_type Ints
 #define i_val int
-#define i_more
+#define i_retain
 #include <stc/cvec.h>
 #include <stc/algo/sort.h>