From 125921db669e4ef6b4fb98efb52bc641db61b82f Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Tue, 6 Jun 2023 13:57:40 -0300 Subject: [PATCH] cgen: fix nested fixed array instantiation (#18357) --- vlib/v/gen/c/array.v | 16 ++++++++++++++++ vlib/v/tests/multiple_arr_fixed_test.v | 8 ++++++++ 2 files changed, 24 insertions(+) create mode 100644 vlib/v/tests/multiple_arr_fixed_test.v diff --git a/vlib/v/gen/c/array.v b/vlib/v/gen/c/array.v index 4430f119d3..a4a45f5c8b 100644 --- a/vlib/v/gen/c/array.v +++ b/vlib/v/gen/c/array.v @@ -172,6 +172,7 @@ fn (mut g Gen) fixed_array_init(node ast.ArrayInit, array_type Type, var_name st } else { elem_sym := g.table.final_sym(node.elem_type) if elem_sym.kind == .map { + // fixed array for map -- [N]map[key_type]value_type info := array_type.unaliased_sym.info as ast.ArrayFixed map_info := elem_sym.map_info() g.expr(ast.MapInit{ @@ -185,6 +186,21 @@ fn (mut g Gen) fixed_array_init(node ast.ArrayInit, array_type Type, var_name st value_type: map_info.value_type }) } + } else if elem_sym.kind == .array_fixed { + // nested fixed array -- [N][N]type + info := array_type.unaliased_sym.info as ast.ArrayFixed + arr_info := elem_sym.array_fixed_info() + g.expr(ast.ArrayInit{ + typ: node.elem_type + elem_type: arr_info.elem_type + }) + for _ in 1 .. info.size { + g.write(', ') + g.expr(ast.ArrayInit{ + typ: node.elem_type + elem_type: arr_info.elem_type + }) + } } else { g.write('0') } diff --git a/vlib/v/tests/multiple_arr_fixed_test.v b/vlib/v/tests/multiple_arr_fixed_test.v new file mode 100644 index 0000000000..7cc060a9c1 --- /dev/null +++ b/vlib/v/tests/multiple_arr_fixed_test.v @@ -0,0 +1,8 @@ +fn test_main() { + mut arr := [2][3][2]map[string]string{} + arr[0][0][1]['key'] = 'value' + dump(arr) + assert arr[0][0][1] == { + 'key': 'value' + } +}