TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-17 03:17:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

cgen: fix mixed fixed array and array initializing (#19246)

Browse Source
This commit is contained in:
yuyi 2023-08-31 23:15:29 +08:00 committed by GitHub
parent 652bb9a3b3
commit 19ff25d456
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
vlib/v/gen/c/array.v
View File

@ -53,6 +53,18 @@ fn (mut g Gen) array_init(node ast.ArrayInit, var_name string) {
} else {
if node.elem_type.has_flag(.option) {
g.expr_with_opt(expr, node.expr_types[i], node.elem_type)
} else if elem_type.unaliased_sym.kind == .array_fixed
&& expr in [ast.Ident, ast.SelectorExpr] {
g.write('{')
info := elem_type.unaliased_sym.info as ast.ArrayFixed
for idx in 0 .. info.size {
g.expr(expr)
g.write('[${idx}]')
if idx != info.size - 1 {
g.write(', ')
}
}
g.write('}')
} else {
g.expr_with_cast(expr, node.expr_types[i], node.elem_type)
}
@ -153,11 +165,29 @@ fn (mut g Gen) fixed_array_init(node ast.ArrayInit, array_type Type, var_name st
}
g.write('{')
if node.has_val {
elem_type := (array_type.unaliased_sym.info as ast.ArrayFixed).elem_type
elem_sym := g.table.final_sym(elem_type)
for i, expr in node.exprs {
if expr.is_auto_deref_var() {
g.write('*')
if elem_sym.kind == .array_fixed && expr in [ast.Ident, ast.SelectorExpr] {
g.write('{')
info := array_type.unaliased_sym.info as ast.ArrayFixed
for idx in 0 .. info.size {
if expr.is_auto_deref_var() {
g.write('*')
}
g.expr(expr)
g.write('[${idx}]')
if idx != info.size - 1 {
g.write(', ')
}
}
g.write('}')
} else {
if expr.is_auto_deref_var() {
g.write('*')
}
g.expr(expr)
}
g.expr(expr)
if i != node.exprs.len - 1 {
g.write(', ')
}

24
vlib/v/tests/mixed_fixed_array_and_array_init_test.v Normal file
View File

@ -0,0 +1,24 @@
fn test_mixed_fixed_array_and_array_init1() {
a := [0.312, 12.0213]!
b := [0.23, 2131.213]!
ab := [a, b]
println(ab)
assert '${ab}' == '[[0.312, 12.0213], [0.23, 2131.213]]'
}
fn test_mixed_fixed_array_and_array_init2() {
a := [0.312, 12.0213]!
b := [0.23, 2131.213]!
mut ab := [a]
ab << b
println(ab)
assert '${ab}' == '[[0.312, 12.0213], [0.23, 2131.213]]'
}
fn test_mixed_fixed_array_and_array_init3() {
a := [0.312, 12.0213]!
b := [0.23, 2131.213]!
mut ab := [a, b]!
println(ab)
assert '${ab}' == '[[0.312, 12.0213], [0.23, 2131.213]]'
}