Commit 007d3b16c7d49f6bb9c5127cc4589f1b5d040306
2024-10-24T19:46:52
wip map_put
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139
diff --git a/libkc3/map.c b/libkc3/map.c
index 4dcbdcf..fc49b70 100644
--- a/libkc3/map.c
+++ b/libkc3/map.c
@@ -86,7 +86,7 @@ s_tag * map_get (const s_map *map, const s_tag *key, s_tag *value)
{
uw i = 0;
while (i < map->count) {
- if (compare_tag(key, map->key + i) == 0)
+ if (! compare_tag(key, map->key + i))
return tag_init_copy(value, map->value + i);
i++;
}
@@ -123,6 +123,20 @@ const s_sym ** map_get_var_type (const s_map *map, const s_tag *key,
return NULL;
}
+uw * map_index (const s_map *map, const s_tag *key, uw *dest)
+{
+ uw i;
+ i = 0;
+ while (i < map->count) {
+ if (! compare_tag(key, map->key + i)) {
+ *dest = i;
+ return dest;
+ }
+ i++;
+ }
+ return NULL;
+}
+
s_map * map_init (s_map *map, uw count)
{
s_map tmp = {0};
@@ -324,20 +338,6 @@ s_map * map_new_from_lists (const s_list *keys, const s_list *values)
}
-s_map * map_set (s_map *map, const s_tag *key, const s_tag *value)
-{
- uw i = 0;
- while (i < map->count) {
- if (compare_tag(key, map->key + i) == 0) {
- if (! tag_init_copy(map->value + i, value))
- return NULL;
- return map;
- }
- i++;
- }
- return NULL;
-}
-
/* bubble sort */
s_map * map_sort (s_map *map)
{
@@ -367,22 +367,44 @@ s_map * map_sort (s_map *map)
s_map * map_put (const s_map *map, const s_tag *key,
const s_tag *value, s_map *dest)
{
- s_map tmp = {0};
- uw i = 0;
- map_init_copy(&tmp, map);
- while (i < map->count) {
- if (compare_tag(key, tmp.key + i) == 0) {
- tag_clean(tmp.value + i);
- if (! tag_init_copy(tmp.value + i, value))
+ s_map tmp;
+ uw i;
+ uw j;
+ if (map_index(map, key, &i)) {
+ if (! map_init(&tmp, map->count))
+ return NULL;
+ j = 0;
+ while (j < tmp.count) {
+ if (! tag_init_copy(tmp.key + j, map->key + j))
goto ko;
- *dest = tmp;
- return dest;
+ if (i == j) {
+ if (! tag_init_copy(tmp.value + j, value))
+ goto ko;
+ }
+ else {
+ if (! tag_init_copy(tmp.value + j, map->value + j))
+ goto ko;
+ }
+ j++;
}
- i++;
}
- ko:
- map_clean(&tmp);
- return NULL;
+ else {
+ if (! map_init(&tmp, map->count + 1))
+ return NULL;
+ j = 0;
+ while (j < map->count) {
+ if (! tag_init_copy(tmp.key + j, map->key + j))
+ goto ko;
+ if (i == j) {
+ if (! tag_init_copy(tmp.value + j, value))
+ goto ko;
+ }
+ else {
+ if (! tag_init_copy(tmp.value + j, map->value + j))
+ goto ko;
+ }
+ j++;
+ }
}
s_map * map_put_list (const s_map *map, const s_list *alist, s_map *dest)
diff --git a/libkc3/map.h b/libkc3/map.h
index 495a41a..fb96083 100644
--- a/libkc3/map.h
+++ b/libkc3/map.h
@@ -31,18 +31,19 @@ s_map * map_new_1 (const char *p);
s_map * map_new_from_lists (const s_list *keys, const s_list *values);
/* Operators. */
-s_map * map_set (s_map *map, const s_tag *key, const s_tag *value);
s_map * map_sort (s_map *map);
/* Observers. */
s_tag * map_access (const s_map *map, const s_list * const *key,
s_tag *value);
s_map * map_cast (const s_tag *tag, s_map *map);
-s_tag * map_get (const s_map *map, const s_tag *key, s_tag *dest);
+s_tag * map_get (const s_map *map, const s_tag *key,
+ s_tag *dest);
const s_sym ** map_get_type (const s_map *map, const s_tag *key,
const s_sym **dest);
const s_sym ** map_get_var_type (const s_map *map, const s_tag *key,
const s_sym **dest);
+uw * map_index (const s_map *map, const s_tag *key, uw *dest);
s_map * map_put (const s_map *map, const s_tag *key,
const s_tag *value, s_map *dest);
s_map * map_put_list (const s_map *map, const s_list *alist,