Commit 910ca64563fa28e75f7a3f944f5ebffde6b77c4b
2024-10-23T12:21:28
map_put, 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
diff --git a/lib/kc3/0.1/facts.kc3 b/lib/kc3/0.1/facts.kc3
index cba238d..886d031 100644
--- a/lib/kc3/0.1/facts.kc3
+++ b/lib/kc3/0.1/facts.kc3
@@ -37,6 +37,9 @@ defmodule Facts do
# returns true if fact was removed or is already absent
def remove_tags = cfn Bool "kc3_facts_remove_tags" (Facts, Tag, Tag, Tag, Result)
+ # returns true if fact was added or is already present
+ def replace_tags = cfn Bool "kc3_facts_replace_tags" (Facts, Tag, Tag, Tag, Result)
+
# with(facts, [[?, ?, ?]], fn (fact) {result}) -> result
def with = cfn Tag "kc3_facts_with" (Facts, List, Fn, Result)
diff --git a/lib/kc3/0.1/map.facts b/lib/kc3/0.1/map.facts
index ee6b75a..5b7cc14 100644
--- a/lib/kc3/0.1/map.facts
+++ b/lib/kc3/0.1/map.facts
@@ -2,10 +2,12 @@
version: 1}
add {Map, :is_a, :module}
add {Map, :symbol, Map.cast}
-add {Map, :symbol, Map.map}
-add {Map, :symbol, Map.to_list}
replace {Map.cast, :symbol_value, cfn Map "map_init_cast" (Tag, Result)}
+add {Map, :symbol, Map.map}
replace {Map.map, :symbol_value, cfn List "map_map" (Map, Fn, Result)}
+add {Map, :symbol, Map.to_list}
replace {Map.to_list, :symbol_value, fn (%{} = map) {
Map.map(map, fn (k, v) { {k, v} })
}}
+add {Map, :symbol, Map.put}
+replace {Map.put, :symbol_value, cfn Map "map_put" (Map, Tag, Tag, Result)}
diff --git a/libkc3/kc3.c b/libkc3/kc3.c
index 2aa6b14..a1c08a0 100644
--- a/libkc3/kc3.c
+++ b/libkc3/kc3.c
@@ -273,6 +273,19 @@ bool * kc3_facts_remove_tags (s_facts *facts, const s_tag *subject,
return dest;
}
+bool * kc3_facts_replace_tags (s_facts *facts,
+ const s_tag *subject,
+ const s_tag *predicate,
+ const s_tag *object,
+ bool *dest)
+{
+ const s_fact *fact;
+ if (! (fact = facts_replace_tags(facts, subject, predicate, object)))
+ return NULL;
+ *dest = true;
+ return dest;
+}
+
s_tag * kc3_facts_with (s_facts *facts, s_list **spec,
s_fn *callback, s_tag *dest)
{
diff --git a/libkc3/kc3_main.h b/libkc3/kc3_main.h
index fd9418e..7a474bc 100644
--- a/libkc3/kc3_main.h
+++ b/libkc3/kc3_main.h
@@ -82,6 +82,11 @@ bool * kc3_facts_remove_tags (s_facts *facts,
const s_tag *predicate,
const s_tag *object,
bool *dest);
+bool * kc3_facts_replace_tags (s_facts *facts,
+ const s_tag *subject,
+ const s_tag *predicate,
+ const s_tag *object,
+ bool *dest);
s_tag * kc3_facts_with (s_facts *facts, s_list **spec,
s_fn *callback, s_tag *dest);
s_tag * kc3_facts_with_tags (s_facts *facts, s_tag *subject,
diff --git a/libkc3/map.c b/libkc3/map.c
index 274ee12..8dc0eda 100644
--- a/libkc3/map.c
+++ b/libkc3/map.c
@@ -364,7 +364,7 @@ s_map * map_sort (s_map *map)
return map;
}
-s_map * map_update (const s_map *map, const s_tag *key,
+s_map * map_put (const s_map *map, const s_tag *key,
const s_tag *value, s_map *dest)
{
s_map tmp = {0};
@@ -384,7 +384,7 @@ s_map * map_update (const s_map *map, const s_tag *key,
return NULL;
}
-s_map * map_update_list (const s_map *map, const s_list *alist, s_map *dest)
+s_map * map_put_list (const s_map *map, const s_list *alist, s_map *dest)
{
const s_list *i = NULL;
s_map tmp = {0};
@@ -394,8 +394,8 @@ s_map * map_update_list (const s_map *map, const s_list *alist, s_map *dest)
while (i) {
assert(i->tag.type == TAG_TUPLE && i->tag.data.tuple.count == 2);
if (i->tag.type != TAG_TUPLE || i->tag.data.tuple.count != 2) {
- err_puts("map_update_list: not an associative list");
- assert(! "map_update_list: not an associative list");
+ err_puts("map_put_list: not an associative list");
+ assert(! "map_put_list: not an associative list");
goto ko;
}
if (! map_set(&tmp, i->tag.data.tuple.tag, i->tag.data.tuple.tag + 1))
diff --git a/libkc3/map.h b/libkc3/map.h
index f2f9996..495a41a 100644
--- a/libkc3/map.h
+++ b/libkc3/map.h
@@ -43,9 +43,9 @@ 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);
-s_map * map_update (const s_map *map, const s_tag *key,
- const s_tag *value, s_map *dest);
-s_map * map_update_list (const s_map *map, const s_list *alist,
- s_map *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 */