mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

cgen: fix assigning literal fixed arrays to map values (#10525)

Browse Source
This commit is contained in:
yuyi 2021-06-20 18:36:01 +08:00 committed by GitHub
parent a21ee1abd4
commit 6c8182cc25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vlib/v/gen/c/cgen.v
View File

@ -2473,7 +2473,9 @@ fn (mut g Gen) gen_assign_stmt(assign_stmt ast.AssignStmt) {
else {}
}
right_sym := g.table.get_type_symbol(g.unwrap_generic(val_type))
is_fixed_array_var := right_sym.kind == .array_fixed && val is ast.Ident
is_fixed_array_var := right_sym.kind == .array_fixed && (val is ast.Ident
|| val is ast.IndexExpr || val is ast.CallExpr
|| val is ast.SelectorExpr)
g.is_assign_lhs = true
g.assign_op = assign_stmt.op
if val_type.has_flag(.optional) {
@ -2490,7 +2492,8 @@ fn (mut g Gen) gen_assign_stmt(assign_stmt ast.AssignStmt) {
g.expr(val)
g.writeln(';}')
}
} else if assign_stmt.op == .assign && (is_fixed_array_init || is_fixed_array_var) {
} else if assign_stmt.op == .assign
&& (is_fixed_array_init || (right_sym.kind == .array_fixed && val is ast.Ident)) {
mut v_var := ''
arr_typ := styp.trim('*')
if is_fixed_array_init {

18
vlib/v/tests/assign_map_value_of_fixed_array_test.v Normal file
View File

@ -0,0 +1,18 @@
fn test_assign_map_value_of_fixed_array() {
mut m := map[string][2]f64{}
m['A'] = [1.1, 2.2]!
m['B'] = [0.1, 0.2]!
mut arr := m['A']
println(arr)
assert '$arr' == '[1.1, 2.2]'
arr = m['B']
println(arr)
assert '$arr' == '[0.1, 0.2]'
arr = m['C']
println(arr)
assert '$arr' == '[0, 0]'
}