Commit c930b2eb986710df4eb2d9584605d695ea742ca0
2024-08-29T02:38:43
env_eval_struct
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
diff --git a/libkc3/env.c b/libkc3/env.c
index 610b7ee..be72c54 100644
--- a/libkc3/env.c
+++ b/libkc3/env.c
@@ -1769,6 +1769,7 @@ bool env_eval_struct (s_env *env, const s_struct *s, s_struct *dest)
s_tag tag = {0};
s_struct tmp = {0};
const s_sym *type;
+ s_var *var = NULL;
assert(env);
assert(s);
assert(dest);
@@ -1783,28 +1784,36 @@ bool env_eval_struct (s_env *env, const s_struct *s, s_struct *dest)
return false;
i = 0;
while (i < tmp.type->map.count) {
- if (tmp.type->map.value[i].type == TAG_VAR)
- type = tmp.type->map.value[i].data.var.type;
+ if (tmp.type->map.value[i].type == TAG_VAR) {
+ var = &tmp.type->map.value[i].data.var;
+ type = var->type;
+ }
else if (! tag_type(tmp.type->map.value + i, &type))
goto ko;
- if (s->tag) {
- if (! env_eval_tag(env, s->tag + i, &tag))
- goto ko;
- if (! tag_to_const_pointer(&tag, type, &data)) {
- tag_clean(&tag);
+ if (var && ! var->ptr) {
+ if (! env_eval_tag(env, s->tag + i,
+ (s_tag *) (s8 *) tmp.data +
+ tmp.type->offset[i]))
goto ko;
- }
- if (! data_init_copy(type, (s8 *) tmp.data + tmp.type->offset[i],
- data))
- goto ko_init;
- tag_clean(&tag);
}
else {
- if (! tag_to_const_pointer(tmp.type->map.value + i, type, &data))
- goto ko;
+ if (s->tag) {
+ if (! env_eval_tag(env, s->tag + i, &tag))
+ goto ko;
+ if (! tag_to_const_pointer(&tag, type, &data)) {
+ tag_clean(&tag);
+ goto ko;
+ }
+ }
+ else {
+ 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;
+ goto ko_init;
+ if (s->tag)
+ tag_clean(&tag);
}
i++;
}