cgen: fix struct field of fixed array init (fix #19483) (#19487)

vlang · Oct 1, 2023 · 6bd4539 · 6bd4539
1 parent f8693ad
commit 6bd4539
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/vlib/v/gen/c/struct.v b/vlib/v/gen/c/struct.v
@@ -386,6 +386,19 @@ fn (mut g Gen) zero_struct_field(field ast.StructField) bool {
 		tmp_var := g.new_tmp_var()
 		g.expr_with_tmp_var(ast.None{}, ast.none_type, field.typ, tmp_var)
 		return true
+	} else if sym.info is ast.ArrayFixed {
+		g.write('{')
+		for i in 0 .. sym.info.size {
+			if sym.info.elem_type.has_flag(.option) {
+				g.expr_with_opt(ast.None{}, ast.none_type, sym.info.elem_type)
+			} else {
+				g.write(g.type_default(sym.info.elem_type))
+			}
+			if i != sym.info.size - 1 {
+				g.write(', ')
+			}
+		}
+		g.write('}')
 	} else {
 		g.write(g.type_default(field.typ))
 	}

diff --git a/vlib/v/tests/array_elements_with_option_test.v b/vlib/v/tests/array_elements_with_option_test.v
@@ -13,8 +13,8 @@ fn get_no_option_fixed() int {
 	return foo.arr2[0]
 }
 
-fn test_option_fixed() ? {
-	x := get_has_option_fixed()?
+fn test_option_fixed() {
+	x := get_has_option_fixed() or { 0 }
 	assert x == 0
 	assert get_no_option_fixed() == 0
 }
@@ -37,7 +37,7 @@ fn get_no_option() int {
 	return foo.arr2[0]
 }
 
-fn test_option_non_fixed() ? {
+fn test_option_non_fixed() {
 	x := get_has_option()?
 	assert x == 0
 	assert get_no_option() == 0

diff --git a/vlib/v/tests/struct_field_fixed_array_init_test.v b/vlib/v/tests/struct_field_fixed_array_init_test.v
@@ -0,0 +1,10 @@
+struct Foo {
+mut:
+	bar [2]string
+}
+
+fn test_struct_field_fixed_array_init() {
+	foo := Foo{}
+	println(foo.bar[0])
+	assert foo.bar[0] == ''
+}