Changed docs and examples to use i_key* template parameters instead of i_val* for all non-maps.

Renamed c_ASSERT() to c_assert() and added optional message parameter to c_static_assert().

1 files changed, 14 insertions, 14 deletions

diff --git a/docs/cqueue_api.md b/docs/cqueue_api.md
index f5df86d6..bce62833 100644
--- a/docs/cqueue_api.md
+++ b/docs/cqueue_api.md
@@ -7,16 +7,16 @@ See the c++ class [std::queue](https://en.cppreference.com/w/cpp/container/queue
 
 ## Header file and declaration
 ```c
-#define i_type      // container type name (default: cset_{i_key})
-#define i_val       // value: REQUIRED
-#define i_valdrop   // destroy value func - defaults to empty destruct
-#define i_valclone  // REQUIRED IF i_valdrop defined
+#define i_type      // container type name (default: cqueue_{i_key})
+#define i_key       // value: REQUIRED
+#define i_keydrop   // destroy value func - defaults to empty destruct
+#define i_keyclone  // REQUIRED IF i_keydrop defined
 
-#define i_valraw    // convertion "raw" type - defaults to i_val
-#define i_valfrom   // convertion func i_valraw => i_val
-#define i_valto     // convertion func i_val* => i_valraw
+#define i_keyraw    // convertion "raw" type - defaults to i_key
+#define i_keyfrom   // convertion func i_keyraw => i_key
+#define i_keyto     // convertion func i_key* => i_keyraw
 
-#define i_tag       // alternative typename: cqueue_{i_tag}. i_tag defaults to i_val
+#define i_tag       // alternative typename: cqueue_{i_tag}. i_tag defaults to i_key
 #include <stc/cqueue.h>
 ```
 `X` should be replaced by the value of `i_tag` in all of the following documentation.
@@ -42,8 +42,8 @@ bool                cqueue_X_empty(const cqueue_X* self);
 cqueue_X_value*     cqueue_X_front(const cqueue_X* self);
 cqueue_X_value*     cqueue_X_back(const cqueue_X* self);
 
-cqueue_X_value*     cqueue_X_push(cqueue_X* self, i_val value);
-cqueue_X_value*     cqueue_X_emplace(cqueue_X* self, i_valraw raw);
+cqueue_X_value*     cqueue_X_push(cqueue_X* self, i_key value);
+cqueue_X_value*     cqueue_X_emplace(cqueue_X* self, i_keyraw raw);
 void                cqueue_X_pop(cqueue_X* self);
 
 cqueue_X_iter       cqueue_X_begin(const cqueue_X* self);
@@ -52,7 +52,7 @@ void                cqueue_X_next(cqueue_X_iter* it);
 cqueue_X_iter       cqueue_X_advance(cqueue_X_iter it, intptr_t n);
 
 bool                cqueue_X_eq(const cqueue_X* c1, const cqueue_X* c2); //  require i_eq/i_cmp/i_less.
-i_val               cqueue_X_value_clone(i_val value);
+i_key               cqueue_X_value_clone(i_key value);
 cqueue_X_raw        cqueue_X_value_toraw(const cqueue_X_value* pval);
 void                cqueue_X_value_drop(cqueue_X_value* pval);
 ```
@@ -62,13 +62,13 @@ void                cqueue_X_value_drop(cqueue_X_value* pval);
 | Type name           | Type definition      | Used to represent...     |
 |:--------------------|:---------------------|:-------------------------|
 | `cqueue_X`          | `cdeq_X`             | The cqueue type          |
-| `cqueue_X_value`    | `i_val`              | The cqueue element type  |
-| `cqueue_X_raw`      | `i_valraw`           | cqueue raw value type    |
+| `cqueue_X_value`    | `i_key`              | The cqueue element type  |
+| `cqueue_X_raw`      | `i_keyraw`           | cqueue raw value type    |
 | `cqueue_X_iter`     | `cdeq_X_iter`        | cqueue iterator          |
 
 ## Examples
 ```c
-#define i_val int
+#define i_key int
 #define i_tag i
 #include <stc/cqueue.h>