Commit 19b751a087c940bc8c331391fda899c6e9df86a2
2024-08-27T09:39:12
fix struct init field to void
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
diff --git a/libkc3/struct.c b/libkc3/struct.c
index b637d19..6b20b2d 100644
--- a/libkc3/struct.c
+++ b/libkc3/struct.c
@@ -335,33 +335,29 @@ s_struct * struct_init_from_lists (s_struct *s, const s_sym *module,
tmp.tag = alloc(tmp.type->map.count * sizeof(s_tag));
if (! tmp.tag)
return NULL;
- k = keys;
- v = values;
- while (k && v) {
- assert(k->tag.type == TAG_SYM);
- if (k->tag.type != TAG_SYM) {
- err_write_1("struct_init_from_lists: key that is not a symbol: ");
- err_puts(tag_type_to_string(k->tag.type));
- assert(! "struct_init_from_lists: key that is not a symbol");
- goto ko;
- }
- if (! struct_find_key_index(&tmp, k->tag.data.sym, &i)) {
- err_write_1("struct_init_from_lists:"
- " cannot find key in defstruct: ");
- err_puts(k->tag.data.sym->str.ptr.pchar);
- assert(! "struct_init_from_lists: cannot find key in defstruct");
- goto ko;
- }
- if (! tag_init_copy(tmp.tag + i, &v->tag))
- goto ko;
- k = list_next(k);
- v = list_next(v);
- }
i = 0;
while (i < tmp.type->map.count) {
- if (! tmp.tag[i].type)
- if (! tag_init_copy(tmp.tag + i, tmp.type->map.value + i))
+ k = keys;
+ v = values;
+ while (k && v) {
+ if (k->tag.type != TAG_SYM) {
+ err_write_1("struct_init_from_lists: key that is not a"
+ " symbol: ");
+ err_puts(tag_type_to_string(k->tag.type));
+ assert(! "struct_init_from_lists: key that is not a symbol");
goto ko;
+ }
+ if (k->tag.data.sym == tmp.type->map.key[i].data.sym) {
+ if (! tag_init_copy(tmp.tag + i, &v->tag))
+ goto ko;
+ goto next;
+ }
+ k = list_next(k);
+ v = list_next(v);
+ }
+ if (! tag_init_copy(tmp.tag + i, tmp.type->map.value + i))
+ goto ko;
+ next:
i++;
}
*s = tmp;