fix: ensure all fixed array elements initialized (#111)

vlang · Jul 29, 2024 · b0c8374 · b0c8374
1 parent 9d4365e
commit b0c8374
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/ast.v b/ast.v
@@ -154,9 +154,8 @@ struct Ident {
 struct TypeOrIdent {
 	node_type_str string @[json: '_type']
 	name          string @[json: 'Name']
+	len           Expr   @[json: 'Len']
 	elt           Ident  @[json: 'Elt']
-	// len           BasicLit @[json: 'Len']
-	len Expr @[json: 'Len']
 }
 
 struct BasicLit {
@@ -179,9 +178,8 @@ struct SelectorExpr {
 // Foo{bar:baz}
 // []bool{}
 struct CompositeLit {
-	typ TypeOrIdent @[json: 'Type']
-
-	elts []Expr @[json: 'Elts']
+	typ  TypeOrIdent @[json: 'Type']
+	elts []Expr      @[json: 'Elts']
 }
 
 /*

diff --git a/struct.v b/struct.v
@@ -71,6 +71,20 @@ fn (mut app App) composite_lit(c CompositeLit) {
 					app.gen(',')
 				}
 			}
+			if have_len {
+				elt_name := go2v_type(c.typ.elt.name)
+				diff := len_val.int() - c.elts.len
+				if diff > 0 {
+					for _ in 0 .. diff {
+						app.gen(',')
+						match elt_name {
+							'int' { app.gen('0') }
+							'string' { app.gen("''") }
+							else { app.gen('unknown element type??') }
+						}
+					}
+				}
+			}
 			app.gen(']')
 			if is_fixed {
 				app.gen('!')

diff --git a/tests/array_fixed_size/array_fixed_size.vv b/tests/array_fixed_size/array_fixed_size.vv
@@ -5,8 +5,8 @@ struct Ok {
 
 fn main() {
 	mut full := [4, 5, 23, 55]!
-	mut one_missing := [4, 5, 23, 55]!
-	mut missing := ['John', 'Paul', 'George', 'Ringo']!
+	mut one_missing := [4, 5, 23, 55, 0]!
+	mut missing := ['John', 'Paul', 'George', 'Ringo', '', '']!
 	mut missing_empty := [2]int{}
 	mut abc := [1, 2, 3]!
 	mut bytes := [u8(1), 2, 3]!