From ec21663f58400e256b805e475b3d3e7a1b91eb46 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Tue, 13 Feb 2024 20:23:35 -0300 Subject: [PATCH] cgen: fix unwrapped option selector assigning (#20816) --- vlib/v/gen/c/cgen.v | 2 +- vlib/v/tests/option_selector_assign_test.v | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 vlib/v/tests/option_selector_assign_test.v diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v index 61b5140ca4..9a975e62b9 100644 --- a/vlib/v/gen/c/cgen.v +++ b/vlib/v/gen/c/cgen.v @@ -3670,7 +3670,7 @@ fn (mut g Gen) selector_expr(node ast.SelectorExpr) { if is_as_cast { g.write('(') } - if node.or_block.kind != .absent && !g.is_assign_lhs && g.table.sym(node.typ).kind != .chan { + if node.or_block.kind != .absent && g.table.sym(node.typ).kind != .chan { is_ptr := sym.kind in [.interface_, .sum_type] stmt_str := g.go_before_last_stmt().trim_space() styp := g.typ(g.unwrap_generic(node.typ)) diff --git a/vlib/v/tests/option_selector_assign_test.v b/vlib/v/tests/option_selector_assign_test.v new file mode 100644 index 0000000000..08d45dad54 --- /dev/null +++ b/vlib/v/tests/option_selector_assign_test.v @@ -0,0 +1,20 @@ +struct Tree { +mut: + nr_elems int + parent ?&Tree +} + +fn (mut t Tree) set_nr_elems(name string, value int) { + t.parent or { return }.nr_elems = value +} + +fn test_main() { + parent := Tree{ + nr_elems: 11 + } + mut child := Tree{ + parent: &parent + } + child.set_nr_elems('Buzz', 123) + assert child.parent or { return }.nr_elems == 123 +}