mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
parent
6b978a6b5a
commit
1d9835f0e4
@ -17,6 +17,9 @@ fn (mut g Gen) for_c_stmt(node ast.ForCStmt) {
|
|||||||
g.indent++
|
g.indent++
|
||||||
if node.has_init {
|
if node.has_init {
|
||||||
g.stmt(node.init)
|
g.stmt(node.init)
|
||||||
|
if node.init is ast.ExprStmt {
|
||||||
|
g.write('; ')
|
||||||
|
}
|
||||||
}
|
}
|
||||||
g.writeln('bool _is_first = true;')
|
g.writeln('bool _is_first = true;')
|
||||||
g.writeln('while (true) {')
|
g.writeln('while (true) {')
|
||||||
@ -58,6 +61,9 @@ fn (mut g Gen) for_c_stmt(node ast.ForCStmt) {
|
|||||||
g.write('; ')
|
g.write('; ')
|
||||||
} else {
|
} else {
|
||||||
g.stmt(node.init)
|
g.stmt(node.init)
|
||||||
|
if node.init is ast.ExprStmt {
|
||||||
|
g.write('; ')
|
||||||
|
}
|
||||||
// Remove excess return and add space
|
// Remove excess return and add space
|
||||||
if g.out.last_n(1) == '\n' {
|
if g.out.last_n(1) == '\n' {
|
||||||
g.go_back(1)
|
g.go_back(1)
|
||||||
|
@ -31,6 +31,7 @@ fn (mut p Parser) for_stmt() ast.Stmt {
|
|||||||
p.close_scope()
|
p.close_scope()
|
||||||
return for_stmt
|
return for_stmt
|
||||||
} else if p.peek_tok.kind in [.decl_assign, .assign, .semicolon]
|
} else if p.peek_tok.kind in [.decl_assign, .assign, .semicolon]
|
||||||
|
|| (p.peek_tok.kind in [.inc, .dec] && p.peek_token(2).kind in [.semicolon, .comma])
|
||||||
|| p.peek_tok.kind.is_assign() || p.tok.kind == .semicolon
|
|| p.peek_tok.kind.is_assign() || p.tok.kind == .semicolon
|
||||||
|| (p.peek_tok.kind == .comma && p.peek_token(2).kind != .key_mut
|
|| (p.peek_tok.kind == .comma && p.peek_token(2).kind != .key_mut
|
||||||
&& p.peek_token(3).kind != .key_in) {
|
&& p.peek_token(3).kind != .key_in) {
|
||||||
@ -49,6 +50,9 @@ fn (mut p Parser) for_stmt() ast.Stmt {
|
|||||||
if p.peek_tok.kind in [.assign, .decl_assign] || p.peek_tok.kind.is_assign() || is_multi {
|
if p.peek_tok.kind in [.assign, .decl_assign] || p.peek_tok.kind.is_assign() || is_multi {
|
||||||
init = p.assign_stmt()
|
init = p.assign_stmt()
|
||||||
has_init = true
|
has_init = true
|
||||||
|
} else if p.peek_tok.kind in [.inc, .dec] {
|
||||||
|
init = p.stmt(false)
|
||||||
|
has_init = true
|
||||||
}
|
}
|
||||||
comments << p.eat_comments()
|
comments << p.eat_comments()
|
||||||
// Allow `for ;; i++ {`
|
// Allow `for ;; i++ {`
|
||||||
|
9
vlib/v/tests/for_c_init_with_var_inc_test.v
Normal file
9
vlib/v/tests/for_c_init_with_var_inc_test.v
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
fn test_for_c_init_with_var_inc() {
|
||||||
|
mut results := []int{}
|
||||||
|
mut i := 0
|
||||||
|
for i++; i < 10; i++ {
|
||||||
|
println(i)
|
||||||
|
results << i
|
||||||
|
}
|
||||||
|
assert results == [1, 2, 3, 4, 5, 6, 7, 8, 9]
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user