harec

commit d9aad3dd2d11df5d92362037751636db1960e0f0
parent 208006549cf2bab30a11f5a2f5e65eaa07e93afb
Author: Bor Grošelj Simić <bgs@turminal.net>
Date:   Thu, 10 Mar 2022 15:22:30 +0100

eval: fix struct_autofill for embedded structs

Fixes: https://todo.sr.ht/~sircmpwn/hare/587
Signed-off-by: Bor Grošelj Simić <bgs@turminal.net>

Diffstat:
M
src/eval.c
 | 
10
++++------
M
tests/11-globals.ha
 | 
15
++++++++++-----

2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/eval.c b/src/eval.c
@@ -612,15 +612,13 @@ autofill_struct(struct context *ctx, const struct type *type, struct struct_cons
 	assert(type->storage == STORAGE_STRUCT || type->storage == STORAGE_UNION);
 	for (const struct struct_field *field = type->struct_union.fields;
 			field; field = field->next) {
+		if (!field->name) {
+			autofill_struct(ctx, type_dealias(field->type), fields);
+			continue;
+		}
 		size_t i = 0;
 		bool skip = false;
 		for (; fields[i]; ++i) {
-			if (!field->name) {
-				autofill_struct(ctx,
-					type_dealias(field->type), fields);
-				skip = true;
-				break;
-			}
 			if (!strcmp(field->name, fields[i]->field->name)) {
 				skip = true;
 				break;
diff --git a/tests/11-globals.ha b/tests/11-globals.ha
@@ -21,12 +21,14 @@ type coords3 = struct { coords: coords, z: int };
 let a3: coords3 = coords3 { ... };
 
 type embedded = struct { a: uint, b: u8 };
+
 type with_embedded = struct { embedded, c: int };
-let em: with_embedded = with_embedded {
-	a = 3,
-	b = 4,
-	c = 18,
-};
+let em: with_embedded = with_embedded { a = 3, b = 4, c = 18 };
+let em_autofill: with_embedded = with_embedded { ... };
+
+type with_embedded2 = struct { c: int, embedded };
+let em2: with_embedded2 = with_embedded2 { a = 3, b = 4, c = 18 };
+let em2_autofill: with_embedded2 = with_embedded2 { ... };
 
 type aenum = enum u64 {
 	BIG_VALUE = 0x1234567887654321,
@@ -47,6 +49,9 @@ fn storage() void = {
 	assert(au.x == 0 && au.y == 0);
 	assert(a3.coords.x == 0 && a3.coords.y == 0 && a3.z == 0);
 	assert(em.a == 3 && em.b == 4 && em.c == 18);
+	assert(em_autofill.a == 0 && em_autofill.b == 0 && em_autofill.c == 0);
+	assert(em2.a == 3 && em2.b == 4 && em2.c == 18);
+	assert(em2_autofill.a == 0 && em2_autofill.b == 0 && em2_autofill.c == 0);
 	assert(big_value == 0x1234567887654321: aenum);
 	assert(float == 1234.5678);
 	assert(double == 1234.5678);