ast, parser: fix complex map init (#14206)

master
yuyi 2022-04-28 22:37:19 +08:00 committed by GitHub
parent dd94ab890a
commit 7aca67fb60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 3 deletions

View File

@ -2074,9 +2074,16 @@ pub fn (mut lx IndexExpr) recursive_mapset_is_setter(val bool) {
if lx.left.is_map {
lx.left.recursive_mapset_is_setter(val)
}
}
}
pub fn (mut lx IndexExpr) recursive_arraymap_set_is_setter() {
lx.is_setter = true
if mut lx.left is IndexExpr {
lx.left.recursive_arraymap_set_is_setter()
} else if mut lx.left is SelectorExpr {
if mut lx.left.expr is IndexExpr {
lx.left.expr.recursive_mapset_is_setter(val)
lx.left.expr.recursive_arraymap_set_is_setter()
}
}
}

View File

@ -423,7 +423,7 @@ pub fn (mut p Parser) expr_with_left(left ast.Expr, precedence int, is_stmt_iden
right := p.expr(precedence - 1)
pos.update_last_line(p.prev_tok.line_nr)
if mut node is ast.IndexExpr {
node.recursive_mapset_is_setter(true)
node.recursive_arraymap_set_is_setter()
}
node = ast.InfixExpr{
left: node

View File

@ -1,10 +1,11 @@
fn test_complex_map_op() {
fn test_complex_map_op1() {
mut test_map := map[string]Point_map{}
test_map['test1'].points['point3'] << Point{10, 20}
test_map['test2'].points['point4'] << Point{50, 60}
println(test_map)
assert test_map.len == 2
assert Point{10, 20} in test_map['test1'].points['point3']
assert Point{50, 60} in test_map['test2'].points['point4']
@ -12,6 +13,21 @@ fn test_complex_map_op() {
assert Point{1, 2} !in test_map['test1'].points['point3']
}
fn test_complex_map_op2() {
mut test_map := map[string]map[string][]Point{}
test_map['test1']['point3'] << Point{10, 20}
test_map['test2']['point4'] << Point{50, 60}
println(test_map)
assert test_map.len == 2
assert Point{10, 20} in test_map['test1']['point3']
assert Point{50, 60} in test_map['test2']['point4']
assert Point{10, 20} !in test_map['test2']['point4']
assert Point{1, 2} !in test_map['test1']['point3']
}
struct Point {
mut:
x int