Skip to content

Commit a61a2fd

Browse files
authored
parser: fix for_c_stmt that init with var assign (#19004)
1 parent c4a6791 commit a61a2fd

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

vlib/v/parser/for.v

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ fn (mut p Parser) for_stmt() ast.Stmt {
3131
p.close_scope()
3232
return for_stmt
3333
} else if p.peek_tok.kind in [.decl_assign, .assign, .semicolon]
34-
|| p.tok.kind == .semicolon || (p.peek_tok.kind == .comma
35-
&& p.peek_token(2).kind != .key_mut && p.peek_token(3).kind != .key_in) {
34+
|| p.peek_tok.kind.is_assign() || p.tok.kind == .semicolon
35+
|| (p.peek_tok.kind == .comma && p.peek_token(2).kind != .key_mut
36+
&& p.peek_token(3).kind != .key_in) {
3637
// `for i := 0; i < 10; i++ {` or `for a,b := 0,1; a < 10; a++ {`
3738
if p.tok.kind == .key_mut {
3839
return p.error('`mut` is not needed in `for ;;` loops: use `for i := 0; i < n; i ++ {`')
@@ -45,7 +46,7 @@ fn (mut p Parser) for_stmt() ast.Stmt {
4546
mut has_inc := false
4647
mut is_multi := p.peek_tok.kind == .comma && p.peek_token(2).kind != .key_mut
4748
&& p.peek_token(3).kind != .key_in
48-
if p.peek_tok.kind in [.assign, .decl_assign] || is_multi {
49+
if p.peek_tok.kind in [.assign, .decl_assign] || p.peek_tok.kind.is_assign() || is_multi {
4950
init = p.assign_stmt()
5051
has_init = true
5152
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
fn test_for_c_init_with_var_assign() {
2+
mut v := 4
3+
mut r := 0
4+
for v >>= 1; v != 0; v >>= 1 {
5+
r++
6+
}
7+
println(r)
8+
assert r == 2
9+
}

0 commit comments

Comments
 (0)