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

a separate scope for

pull/3009/head
Alexander Medvednikov 2019-12-08 00:30:06 +03:00
parent dc2da1de98
commit 06a0f39f7b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/compiler/cflags.v
View File

@ -106,9 +106,9 @@ fn (table mut Table) parse_cflag(cflag string, mod string) ?bool {
index = i index = i
} }
} }
if i2 := flag.index(',') { if i := flag.index(',') {
if index == -1 || i2 < index { if index == -1 || i < index {
index = i2 index = i
} }
} }
if index != -1 && flag[index] == ` ` && flag[index+1] == `-` { if index != -1 && flag[index] == ` ` && flag[index+1] == `-` {

2
vlib/compiler/if_match.v
View File

@ -234,6 +234,7 @@ fn (p mut Parser) if_statement(is_expr bool, elif_depth int) string {
if p.known_var(var_name) { if p.known_var(var_name) {
p.error('redefinition of `$var_name`') p.error('redefinition of `$var_name`')
} }
p.open_scope()
p.next() p.next()
p.check(.decl_assign) p.check(.decl_assign)
p.is_var_decl = true p.is_var_decl = true
@ -262,6 +263,7 @@ fn (p mut Parser) if_statement(is_expr bool, elif_depth int) string {
//token_idx: var_token_idx //token_idx: var_token_idx
}) })
p.statements() p.statements()
p.close_scope()
p.returns = false p.returns = false
return 'void' return 'void'
} else { } else {