Commit 708530a08493e84e3cb2c2ba71cc107126186d6f
2024-10-25T10:07:32
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
diff --git a/libkc3/map.c b/libkc3/map.c
index fc49b70..6efd622 100644
--- a/libkc3/map.c
+++ b/libkc3/map.c
@@ -338,32 +338,6 @@ s_map * map_new_from_lists (const s_list *keys, const s_list *values)
}
-/* bubble sort */
-s_map * map_sort (s_map *map)
-{
- uw i;
- uw j;
- s_tag k;
- s_tag v;
- i = map->count;
- while (i > 0) {
- i--;
- j = 1;
- while (j <= i) {
- if (compare_tag(map->key + j, map->key + (j - 1)) < 0) {
- k = map->key[j];
- v = map->value[j];
- map->key[j] = map->key[j - 1];
- map->value[j] = map->value[j - 1];
- map->key[j - 1] = k;
- map->value[j - 1] = v;
- }
- j++;
- }
- }
- return map;
-}
-
s_map * map_put (const s_map *map, const s_tag *key,
const s_tag *value, s_map *dest)
{
@@ -395,18 +369,25 @@ s_map * map_put (const s_map *map, const s_tag *key,
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;
- }
+ if (! tag_init_copy(tmp.value + j, map->value + j))
+ goto ko;
j++;
}
+ if (! tag_init_copy(tmp.key + j, key))
+ goto ko;
+ if (! tag_init_copy(tmp.value + j, value))
+ goto ko;
+ if (! map_sort(&tmp))
+ goto ko;
+ }
+ *dest = tmp;
+ return dest;
+ ko:
+ map_clean(&tmp);
+ return NULL;
}
+/*
s_map * map_put_list (const s_map *map, const s_list *alist, s_map *dest)
{
const s_list *i = NULL;
@@ -431,3 +412,30 @@ s_map * map_put_list (const s_map *map, const s_list *alist, s_map *dest)
map_clean(&tmp);
return NULL;
}
+*/
+
+/* bubble sort */
+s_map * map_sort (s_map *map)
+{
+ uw i;
+ uw j;
+ s_tag k;
+ s_tag v;
+ i = map->count;
+ while (i > 0) {
+ i--;
+ j = 1;
+ while (j <= i) {
+ if (compare_tag(map->key + j, map->key + (j - 1)) < 0) {
+ k = map->key[j];
+ v = map->value[j];
+ map->key[j] = map->key[j - 1];
+ map->value[j] = map->value[j - 1];
+ map->key[j - 1] = k;
+ map->value[j - 1] = v;
+ }
+ j++;
+ }
+ }
+ return map;
+}
diff --git a/libkc3/map.h b/libkc3/map.h
index fb96083..0c3d0b8 100644
--- a/libkc3/map.h
+++ b/libkc3/map.h
@@ -46,7 +46,9 @@ const s_sym ** map_get_var_type (const s_map *map, const s_tag *key,
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,
s_map *dest);
+*/
#endif /* LIBKC3_MAP_H */