Commit cf10b6734f7aea65b9a1fb4f2bbfec5727d4c4c1
2023-11-19T15:21:58
map: pattern matching
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/libc3/env.c b/libc3/env.c
index 5e54ee0..2e9e7d8 100644
--- a/libc3/env.c
+++ b/libc3/env.c
@@ -332,6 +332,8 @@ bool env_eval_equal_list (s_env *env, const s_list *a, const s_list *b,
s_list *b_next;
s_list *tmp = NULL;
s_list **t;
+ assert(env);
+ assert(dest);
t = &tmp;
while (1) {
if (! a && ! b) {
@@ -343,18 +345,21 @@ bool env_eval_equal_list (s_env *env, const s_list *a, const s_list *b,
if (! b)
goto ko;
*t = list_new(NULL, NULL);
- if (! env_eval_equal_tag(env, &a->tag, &b->tag, &(*t)->tag))
+ if (! env_eval_equal_tag(env, &a->tag, &b->tag,
+ &(*t)->tag))
goto ko;
a_next = list_next(a);
b_next = list_next(b);
if (! a_next || ! b_next) {
- if (! env_eval_equal_tag(env, &a->next, &b->next, &(*t)->next))
+ if (! env_eval_equal_tag(env, &a->next, &b->next,
+ &(*t)->next))
goto ko;
goto ok;
}
a = a_next;
b = b_next;
- t = &(*t)->next.data.list;
+ if (dest)
+ t = &(*t)->next.data.list;
}
ok:
*dest = tmp;
@@ -364,6 +369,53 @@ bool env_eval_equal_list (s_env *env, const s_list *a, const s_list *b,
return false;
}
+bool env_eval_equal_map (s_env *env, const s_map *a,
+ const s_map *b, s_map *dest)
+{
+ const s_map *c;
+ uw i;
+ uw j;
+ s_tag tmp;
+ assert(env);
+ assert(a);
+ assert(b);
+ assert(dest);
+ if (! a->count) {
+ map_copy(b, dest);
+ return true;
+ }
+ if (! b->count) {
+ map_copy(a, dest);
+ return true;
+ }
+ if (a->count > b->count) {
+ c = a;
+ a = b;
+ b = c;
+ }
+ i = 0;
+ while (i < a->count) {
+ j = 0;
+ while (j < b->count) {
+ if (! compare_tag(a->keys + i, b->keys + j)) {
+ if (! env_eval_equal_tag(env, a->values + i, b->values + j,
+ &tmp)) {
+ return false;
+ }
+ tag_clean(&tmp);
+ goto next;
+ }
+ j++;
+ }
+ return false;
+ next:
+ i++;
+ }
+ if (dest)
+ map_copy(b, dest);
+ return true;
+}
+
bool env_eval_equal_tag (s_env *env, const s_tag *a, const s_tag *b,
s_tag *dest)
{
@@ -445,6 +497,10 @@ bool env_eval_equal_tag (s_env *env, const s_tag *a, const s_tag *b,
tag_init_list(dest, NULL);
return env_eval_equal_list(env, a->data.list, b->data.list,
&dest->data.list);
+ case TAG_MAP:
+ dest->type = TAG_MAP;
+ return env_eval_equal_map(env, &a->data.map, &b->data.map,
+ &dest->data.map);
case TAG_TUPLE:
dest->type = TAG_TUPLE;
return env_eval_equal_tuple(env, &a->data.tuple, &b->data.tuple,
diff --git a/test/ic3/map.in b/test/ic3/map.in
index d47d159..6eb013e 100644
--- a/test/ic3/map.in
+++ b/test/ic3/map.in
@@ -40,3 +40,13 @@ quote %{a: 1, b: 2, c: 3}
%{a: 1, b: 2, c: 3}
quote %{c: 1, b: 2, a: 3}
%{a: 3, b: 2, c: 1}
+quote %{} = %{a: 1, b: 2}
+%{} = %{a: 1, b: 2}
+quote %{a: a} = %{a: 1, b: 2}
+%{a: a} = %{a: 1, b: 2}
+quote a
+a
+quote %{b: b} = %{a: 1, b: 2}
+%{b: b} = %{a: 1, b: 2}
+quote b
+b
diff --git a/test/ic3/map.out.expected b/test/ic3/map.out.expected
index c769ec2..0cbf8ab 100644
--- a/test/ic3/map.out.expected
+++ b/test/ic3/map.out.expected
@@ -40,3 +40,13 @@
%{a: 1, b: 2, c: 3}
%{a: 3, b: 2, c: 1}
%{a: 3, b: 2, c: 1}
+%{} = %{a: 1, b: 2}
+%{a: 1, b: 2}
+%{a: a} = %{a: 1, b: 2}
+%{a: 1, b: 2}
+a
+1
+%{b: b} = %{a: 1, b: 2}
+%{a: 1, b: 2}
+b
+2