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

enable else-if expression

pull/1094/head
hazohelet 2019-07-12 12:43:21 +09:00 committed by Alexander Medvednikov
parent 22b41c7873
commit e15c2da1f4
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/parser.v
View File

@ -1009,7 +1009,7 @@ fn (p mut Parser) statement(add_semi bool) string {
case Token.dollar: case Token.dollar:
p.comp_time() p.comp_time()
case Token.key_if: case Token.key_if:
p.if_st(false) p.if_st(false, false)
case Token.key_for: case Token.key_for:
p.for_st() p.for_st()
case Token.key_switch: case Token.key_switch:
@ -2084,7 +2084,7 @@ fn (p mut Parser) factor() string {
// { user | name :'new name' } // { user | name :'new name' }
return p.assoc() return p.assoc()
case Token.key_if: case Token.key_if:
typ = p.if_st(true) typ = p.if_st(true, false)
return typ return typ
default: default:
next := p.peek() next := p.peek()
@ -2731,7 +2731,7 @@ fn (p mut Parser) chash() {
} }
} }
fn (p mut Parser) if_st(is_expr bool) string { fn (p mut Parser) if_st(is_expr, is_elif_expr bool) string {
if is_expr { if is_expr {
if p.fileis('if_expr') { if p.fileis('if_expr') {
println('IF EXPR') println('IF EXPR')
@ -2770,8 +2770,14 @@ fn (p mut Parser) if_st(is_expr bool) string {
p.check(.key_else) p.check(.key_else)
p.fspace() p.fspace()
if p.tok == .key_if { if p.tok == .key_if {
if is_expr {
p.gen(') : (')
return p.if_st(is_expr, true)
}
else {
p.gen(' else ') p.gen(' else ')
return p.if_st(is_expr) return p.if_st(is_expr, false)
}
// return '' // return ''
} }
if is_expr { if is_expr {
@ -2785,8 +2791,13 @@ fn (p mut Parser) if_st(is_expr bool) string {
typ = p.statements() typ = p.statements()
p.inside_if_expr = false p.inside_if_expr = false
if is_expr { if is_expr {
if is_elif_expr {
p.gen('))')
}
else {
p.gen(')') p.gen(')')
} }
}
return typ return typ
} }
p.inside_if_expr = false p.inside_if_expr = false