cgen: fix type_default for array init >= 8 items (spotted while build…

…ing the vhamll project) (#23334)
vlang · Jan 1, 2025 · a366582 · a366582
1 parent 87c0a9c
commit a366582
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -7043,7 +7043,7 @@ fn (mut g Gen) type_default_impl(typ_ ast.Type, decode_sumtype bool) string {
 								}
 							} else {
 								default_str := g.expr_string_opt(field.typ, field.default_expr)
-								if default_str.count('\n') > 1 {
+								if default_str.count(';\n') > 1 {
 									g.type_default_vars.writeln(default_str.all_before_last('\n'))
 									expr_str = default_str.all_after_last('\n')
 								} else {

diff --git a/vlib/v/tests/structs/default_expr_array_init_test.v b/vlib/v/tests/structs/default_expr_array_init_test.v
@@ -0,0 +1,15 @@
+struct Foo {
+pub mut:
+	integer_range_for_discrete []int = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+}
+
+fn foo(a string) Foo {
+	return match a {
+		'a' { Foo{} }
+		else { panic('foo') }
+	}
+}
+
+fn test_main() {
+	assert foo('a') == Foo{}
+}