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

tools: fix `v vet file.v` for `return if x { y // comment } else { z }`

master
Delyan Angelov 2022-06-20 13:28:53 +03:00
parent cf1fc6f090
commit 0e4198f23b
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
cmd/tools/vvet/tests/accept_multi_expression_with_comments.out 100644
View File

7
cmd/tools/vvet/tests/accept_multi_expression_with_comments.vv 100644
View File

@ -0,0 +1,7 @@
fn abc() int {
return if true {
0x4000 // 16KB
} else {
0x1000 // 4KB
}
}

2
vlib/v/parser/parser.v
View File

@ -1977,7 +1977,7 @@ fn (mut p Parser) parse_multi_expr(is_top_level bool) ast.Stmt {
// TODO remove translated // TODO remove translated
if p.tok.kind in [.assign, .decl_assign] || p.tok.kind.is_assign() { if p.tok.kind in [.assign, .decl_assign] || p.tok.kind.is_assign() {
return p.partial_assign_stmt(left, left_comments) return p.partial_assign_stmt(left, left_comments)
} else if !p.pref.translated && !p.is_translated && !p.pref.is_fmt } else if !p.pref.translated && !p.is_translated && !p.pref.is_fmt && !p.pref.is_vet
&& tok.kind !in [.key_if, .key_match, .key_lock, .key_rlock, .key_select] { && tok.kind !in [.key_if, .key_match, .key_lock, .key_rlock, .key_select] {
for node in left { for node in left {
if (is_top_level || p.tok.kind != .rcbr) && node !is ast.CallExpr if (is_top_level || p.tok.kind != .rcbr) && node !is ast.CallExpr