fix other cases and add tests

yuyi98 · Dec 18, 2024 · 9abb53a · 9abb53a
1 parent c9522fc
commit 9abb53a
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 8 deletions.
diff --git a/vlib/v/gen/c/struct.v b/vlib/v/gen/c/struct.v
@@ -688,13 +688,26 @@ fn (mut g Gen) struct_init_field(sfield ast.StructInitField, language ast.Langua
 		if field_unwrap_sym.info is ast.ArrayFixed {
 			match sfield.expr {
 				ast.Ident, ast.SelectorExpr {
-					g.fixed_array_var_init(g.expr_string(sfield.expr), is_auto_deref_var,
-						field_unwrap_sym.info.elem_type, field_unwrap_sym.info.size)
+					if sfield.expected_type.has_flag(.option) {
+						if field_unwrap_typ.has_flag(.option) {
+							g.expr_with_opt(sfield.expr, sfield.expected_type, field_unwrap_typ)
+						} else {
+							g.expr_with_fixed_array_opt(sfield.expr, sfield.expected_type,
+								field_unwrap_typ)
+						}
+					} else {
+						g.fixed_array_var_init(g.expr_string(sfield.expr), is_auto_deref_var,
+							field_unwrap_sym.info.elem_type, field_unwrap_sym.info.size)
+					}
 				}
 				ast.CastExpr, ast.CallExpr {
-					if sfield.expected_type.has_flag(.option) && !field_unwrap_typ.has_flag(.option) {
-						g.expr_with_fixed_array_opt(sfield.expr, sfield.expected_type,
-							field_unwrap_typ)
+					if sfield.expected_type.has_flag(.option) {
+						if field_unwrap_typ.has_flag(.option) {
+							g.expr_with_opt(sfield.expr, sfield.expected_type, field_unwrap_typ)
+						} else {
+							g.expr_with_fixed_array_opt(sfield.expr, sfield.expected_type,
+								field_unwrap_typ)
+						}
 					} else {
 						tmp_var := g.expr_with_var(sfield.expr, sfield.expected_type,
 							false)

diff --git a/vlib/v/tests/structs/struct_field_init_with_fixed_array_opt_test.v b/vlib/v/tests/structs/struct_field_init_with_fixed_array_opt_test.v
@@ -6,10 +6,27 @@ struct Foo {
 }
 
 fn test_struct_field_init_with_fixed_array_opt() {
-	f := Foo{
+	f1 := Foo{
 		bar: 1
 		baz: Arr([u8(5), 4, 3, 2]!)
 	}
-	println(f)
-	assert f.baz as Arr == [u8(5), 4, 3, 2]!
+	println(f1)
+	assert f1.baz as Arr == [u8(5), 4, 3, 2]!
+
+	f2 := Foo{
+		bar: 1
+		baz: ?Arr(none)
+	}
+	println(f2)
+	assert f2.bar == 1
+	assert f2.baz == none
+
+	arr := Arr([u8(5), 4, 3, 2]!)
+	f3 := Foo{
+		bar: 1
+		baz: arr
+	}
+	println(f3)
+	assert f3.bar == 1
+	assert f3.baz as Arr == [u8(5), 4, 3, 2]!
 }