vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

cgen: fix `vals[i].field = x`

pull/4081/head
Alexander Medvednikov 2020-03-20 17:03:41 +01:00
parent 4fac09bcb4
commit 078f498b17
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vlib/v/gen/cgen.v
View File

@ -1274,8 +1274,6 @@ fn (g mut Gen) index_expr(node ast.IndexExpr) {
} }
else {} else {}
} }
// if !is_range && node.container_type == 0 {
// }
if !is_range && node.container_type != 0 { if !is_range && node.container_type != 0 {
sym := g.table.get_type_symbol(node.container_type) sym := g.table.get_type_symbol(node.container_type)
if table.type_is_variadic(node.container_type) { if table.type_is_variadic(node.container_type) {
@ -1288,7 +1286,16 @@ fn (g mut Gen) index_expr(node ast.IndexExpr) {
else if sym.kind == .array { else if sym.kind == .array {
info := sym.info as table.Array info := sym.info as table.Array
elem_type_str := g.typ(info.elem_type) elem_type_str := g.typ(info.elem_type)
if g.is_assign_expr { // `vals[i].field = x` is an exception and requires `array_get`:
// `(*(Val*)array_get(vals, i)).field = x ;`
mut is_selector := false
match node.left {
ast.SelectorExpr {
is_selector = true
}
else {}
}
if g.is_assign_expr && !is_selector {
g.is_array_set = true g.is_array_set = true
g.write('array_set(&') g.write('array_set(&')
g.expr(node.left) g.expr(node.left)