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

ast, cgen: fix match struct.field? {...} (#16478)

Browse Source
This commit is contained in:
shove 2022-11-19 16:42:36 +08:00 committed by GitHub
parent 2d9808b2dc
commit 092f984708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vlib/v/ast/str.v
View File

@ -440,7 +440,14 @@ pub fn (x Expr) str() string {
return 'ast.SelectExpr'
}
SelectorExpr {
return '${x.expr.str()}.${x.field_name}'
propagate_suffix := if x.or_block.kind == .propagate_option {
'?'
} else if x.or_block.kind == .propagate_result {
'!'
} else {
''
}
return '${x.expr.str()}.${x.field_name}${propagate_suffix}'
}
SizeOf {
if x.is_type {

4
vlib/v/gen/c/match.v
View File

@ -63,7 +63,9 @@ fn (mut g Gen) match_expr(node ast.MatchExpr) {
g.inside_match_result = true
}
}
if node.cond in [ast.Ident, ast.SelectorExpr, ast.IntegerLiteral, ast.StringLiteral, ast.FloatLiteral] {
if node.cond in [ast.Ident, ast.IntegerLiteral, ast.StringLiteral, ast.FloatLiteral]
|| (node.cond is ast.SelectorExpr
&& (node.cond as ast.SelectorExpr).or_block.kind == .absent) {
cond_var = g.expr_string(node.cond)
} else {
line := if is_expr {

9
vlib/v/tests/inout/struct_field_optional.out
View File

@ -1,9 +1,9 @@
1
[vlib/v/tests/inout/struct_field_optional.vv:11] f.bar: 1
[vlib/v/tests/inout/struct_field_optional.vv:11] f.bar?: 1
2
[vlib/v/tests/inout/struct_field_optional.vv:18] f.bar: 2
[vlib/v/tests/inout/struct_field_optional.vv:18] f.bar?: 2
3
[vlib/v/tests/inout/struct_field_optional.vv:22] f.bar: 3
[vlib/v/tests/inout/struct_field_optional.vv:22] f.bar?: 3
3
[vlib/v/tests/inout/struct_field_optional.vv:26] a: 3
9999
@ -14,11 +14,12 @@
[vlib/v/tests/inout/struct_field_optional.vv:36] sum: 4
3
none
3
Foo{
bar: 3
baz: 0
}
[vlib/v/tests/inout/struct_field_optional.vv:50] f: Foo{
[vlib/v/tests/inout/struct_field_optional.vv:57] f: Foo{
bar: 3
baz: 0
}

7
vlib/v/tests/inout/struct_field_optional.vv
View File

@ -45,6 +45,13 @@ fn main() {
} else {
println(err)
}
// `match` test
match f.bar? {
f.bar? {
println(f.bar?)
}
else {}
}
// others test
println(f)
dump(f)