Commit 9b9fc22864027e20c89b1d5ac72f61cbfbfd9ca1
2024-08-27T16:21:04
wip struct_eval
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
diff --git a/libkc3/env.c b/libkc3/env.c
index fb90c6a..5d175a0 100644
--- a/libkc3/env.c
+++ b/libkc3/env.c
@@ -1764,12 +1764,11 @@ bool env_eval_quote_unquote (s_env *env, const s_unquote *unquote, s_tag *dest)
bool env_eval_struct (s_env *env, const s_struct *s, s_struct *dest)
{
+ const void *data;
uw i;
- s_tag tag = {0};
- const void *tag_data;
+ s_tag tag = {0};
s_struct tmp = {0};
const s_sym *type;
- const void *value;
assert(env);
assert(s);
assert(dest);
@@ -1791,37 +1790,21 @@ bool env_eval_struct (s_env *env, const s_struct *s, s_struct *dest)
if (s->tag) {
if (! env_eval_tag(env, s->tag + i, &tag))
goto ko;
- if (type == &g_sym_Tag) {
- if (! tag_init_copy((s_tag *) ((s8 *) tmp.data +
- tmp.type->offset[i]),
- &tag))
- goto ko_init;
- }
- else {
- if (! tag_to_const_pointer(&tag, type, &tag_data)) {
- tag_clean(&tag);
- goto ko;
- }
- if (! data_init_copy(type, (s8 *) tmp.data + tmp.type->offset[i],
- tag_data))
- goto ko_init;
+ if (! tag_to_const_pointer(&tag, type, &data)) {
+ tag_clean(&tag);
+ goto ko;
}
+ if (! data_init_copy(type, (s8 *) tmp.data + tmp.type->offset[i],
+ data))
+ goto ko_init;
tag_clean(&tag);
}
else {
- if (type == &g_sym_Tag) {
- if (! tag_init_copy((s_tag *) ((s8 *) tmp.data +
- tmp.type->offset[i]),
- tmp.type->map.value + i))
- goto ko_init;
- }
- else {
- if (! tag_to_const_pointer(tmp.type->map.value + i, type, &value))
- goto ko;
- if (! data_init_copy(type, (s8 *) tmp.data + tmp.type->offset[i],
- value))
- goto ko;
- }
+ if (! tag_to_const_pointer(tmp.type->map.value + i, type, &data))
+ goto ko;
+ if (! data_init_copy(type, (s8 *) tmp.data + tmp.type->offset[i],
+ data))
+ goto ko;
}
i++;
}