From 433e6fd36912d1c584fbf206f99a3a982b29e9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tyge=20L=C3=B8vset?= <tylo@norceresearch.no>
Date: Mon, 3 Jul 2023 07:22:25 +0200
Subject: [PATCH] Simplified extend.h a bit.

---
 include/stc/extend.h    |  5 ++++-
 misc/examples/functor.c | 33 ++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/include/stc/extend.h b/include/stc/extend.h
index f9ac92bf..c0a00ff8 100644
--- a/include/stc/extend.h
+++ b/include/stc/extend.h
@@ -54,7 +54,10 @@ typedef struct {
     i_type get;
 } c_PASTE(i_type, _ext);
 
-#define c_extend(self) c_container_of(self, _cx_MEMB(_ext), get)
+#define c_extend() c_container_of(self, _cx_MEMB(_ext), get)
+// Note: i_less: c_extend() accessible for cpque types
+//       i_cmp: c_extend() accessible for csmap and csset types
+//       i_hash/i_eq: c_extend() accessible for cmap and cset types
 
 #define i_is_forward
 #define _i_inc <stc/i_base.h>
diff --git a/misc/examples/functor.c b/misc/examples/functor.c
index d6adfcb1..a233a874 100644
--- a/misc/examples/functor.c
+++ b/misc/examples/functor.c
@@ -1,22 +1,22 @@
 // Implements c++ example: https://en.cppreference.com/w/cpp/container/priority_queue
 // Example of per-instance less-function on a single priority queue type
 //
-// Note: i_less: has self for cpque types only
-//       i_cmp: has self for csmap and csset types only
-//       i_hash/i_eq: has self for cmap and cset types only
 
 #include <stdio.h>
 
 #define i_type IPQue
 #define i_base cpque
 #define i_val int
-#define i_extend bool (*less)(const int*, const int*);
-#define i_less(x, y) c_extend(self)->less(x, y)
+#define i_extend bool(*less)(const int*, const int*);
+#define i_less(x, y) c_extend()->less(x, y)
+// Note: i_less: c_extend() accessible for cpque types
+//       i_cmp: c_extend() accessible for csmap and csset types
+//       i_hash/i_eq: c_extend() accessible for cmap and cset types
 #include <stc/extend.h>
 
 void print_queue(const char* name, IPQue_ext q) {
     // NB: make a clone because there is no way to traverse
-    // priority_queue's content without erasing the queue.
+    // priority queue's content without erasing the queue.
     IPQue_ext copy = {q.less, IPQue_clone(q.get)};
     
     for (printf("%s: \t", name); !IPQue_empty(&copy.get); IPQue_pop(&copy.get))
@@ -34,24 +34,23 @@ int main()
 {
     const int data[] = {1,8,5,6,3,4,0,9,7,2}, n = c_arraylen(data);
     printf("data: \t");
-    c_forrange (i, n)
-        printf("%d ", data[i]);
+    c_forrange (i, n) printf("%d ", data[i]);
     puts("");
 
-    IPQue_ext q1 = {int_less};       // Max priority queue
-    IPQue_ext minq1 = {int_greater}; // Min priority queue
-    IPQue_ext q5 = {int_lambda};     // Using lambda to compare elements.
 
-    c_forrange (i, n)
-        IPQue_push(&q1.get, data[i]);
+    // Max priority queue
+    IPQue_ext q1 = {.less=int_less};
+    IPQue_put_n(&q1.get, data, n);
     print_queue("q1", q1);
 
-    c_forrange (i, n)
-        IPQue_push(&minq1.get, data[i]);
+    // Min priority queue
+    IPQue_ext minq1 = {.less=int_greater};
+    IPQue_put_n(&minq1.get, data, n);
     print_queue("minq1", minq1);
 
-    c_forrange (i, n)
-        IPQue_push(&q5.get, data[i]);
+    // Using lambda to compare elements.
+    IPQue_ext q5 = {.less=int_lambda};
+    IPQue_put_n(&q5.get, data, n);
     print_queue("q5", q5);
 
     c_drop(IPQue, &q1.get, &minq1.get, &q5.get);