Merge branch 'master' into modified

1 files changed, 27 insertions, 31 deletions

diff --git a/docs/cset_api.md b/docs/cset_api.md
index 287f7636..026d7462 100644
--- a/docs/cset_api.md
+++ b/docs/cset_api.md
@@ -19,8 +19,6 @@ A **cset** is an associative container that contains a set of unique objects of
 #define i_keyto     // convertion func i_key* => i_keyraw - defaults to plain copy
 
 #define i_tag       // alternative typename: cmap_{i_tag}. i_tag defaults to i_val
-#define i_hash_functor // advanced, see examples/functor.c for similar usage.
-#define i_eq_functor // advanced, see examples/functor.c for similar usage.
 #define i_ssize      // default int32_t. If defined, table expand 2x (else 1.5x)
 #include <stc/cset.h>
 ```
@@ -70,47 +68,45 @@ cset_X_value        cset_X_value_clone(cset_X_value val);
 | Type name          | Type definition                                  | Used to represent...        |
 |:-------------------|:-------------------------------------------------|:----------------------------|
 | `cset_X`           | `struct { ... }`                                 | The cset type               |
-| `cset_X_rawkey`    | `i_keyraw`                                       | The raw key type            |
-| `cset_X_raw`       | `i_keyraw`                                       | The raw value type          |
 | `cset_X_key`       | `i_key`                                          | The key type                |
-| `cset_X_value`     | `i_key`                                          | The value                   |
+| `cset_X_value`     | `i_key`                                          | The key type (alias)        |
+| `cset_X_keyraw`    | `i_keyraw`                                       | The raw key type            |
+| `cset_X_raw`       | `i_keyraw`                                       | The raw key type (alias)    |
 | `cset_X_result`    | `struct { cset_X_value* ref; bool inserted; }`   | Result of insert/emplace    |
 | `cset_X_iter`      | `struct { cset_X_value *ref; ... }`              | Iterator type               |
 
 ## Example
 ```c
 #include <stc/cstr.h>
-
+#define i_type Strset
 #define i_key_str
 #include <stc/cset.h>
 
 int main ()
 {
-    c_auto (cset_str, fifth)
-    {
-        c_auto (cset_str, first, second)
-        c_auto (cset_str, third, fourth)
-        {
-            second = c_make(cset_str, {"red", "green", "blue"});
-
-            c_forlist (i, const char*, {"orange", "pink", "yellow"})
-                cset_str_emplace(&third, *i.ref);
-
-            cset_str_emplace(&fourth, "potatoes");
-            cset_str_emplace(&fourth, "milk");
-            cset_str_emplace(&fourth, "flour");
-
-            fifth = cset_str_clone(second);
-            c_foreach (i, cset_str, third)
-                cset_str_emplace(&fifth, cstr_str(i.ref));
-
-            c_foreach (i, cset_str, fourth)
-                cset_str_emplace(&fifth, cstr_str(i.ref));
-        }
-        printf("fifth contains:\n\n");
-        c_foreach (i, cset_str, fifth)
-            printf("%s\n", cstr_str(i.ref));
-    }
+    Strset first, second={0}, third={0}, fourth={0}, fifth;
+
+    first = c_make(Strset, {"red", "green", "blue"});
+    fifth = Strset_clone(second);
+
+    c_forlist (i, const char*, {"orange", "pink", "yellow"})
+        Strset_emplace(&third, *i.ref);
+
+    c_foreach (i, Strset, third)
+        Strset_insert(&fifth, cstr_clone(*i.ref));
+
+    Strset_emplace(&fourth, "potatoes");
+    Strset_emplace(&fourth, "milk");
+    Strset_emplace(&fourth, "flour");
+
+    c_foreach (i, Strset, fourth)
+        Strset_emplace(&fifth, cstr_str(i.ref));
+
+    printf("fifth contains:\n\n");
+    c_foreach (i, Strset, fifth)
+        printf("%s\n", cstr_str(i.ref));
+
+    c_drop(Strset, &first, &second, &third, &fourth, &fifth);
 }
 ```
 Output: