mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

fix the build

Browse Source
This commit is contained in:
Alexander Medvednikov 2019-11-11 06:06:49 +03:00
parent 0ad0a61db2
commit 8947717e3e
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vlib/compiler/cgen.v
View File

@ -106,7 +106,7 @@ fn (g mut CGen) save() {
} }
// returns expression's type, and entire expression's string representation // returns expression's type, and entire expression's string representation)
fn (p mut Parser) tmp_expr() (string, string) { fn (p mut Parser) tmp_expr() (string, string) {
// former start_tmp() // former start_tmp()
if p.cgen.is_tmp { if p.cgen.is_tmp {
@ -117,7 +117,7 @@ fn (p mut Parser) tmp_expr() (string, string) {
p.cgen.is_tmp = true p.cgen.is_tmp = true
// //
typ := p.bool_expression() typ := p.bool_expression()
// former end_tmp()
res := p.cgen.tmp_line res := p.cgen.tmp_line
if p.cgen.prev_tmps.len > 0 { if p.cgen.prev_tmps.len > 0 {
p.cgen.tmp_line = p.cgen.prev_tmps.last() p.cgen.tmp_line = p.cgen.prev_tmps.last()

2
vlib/compiler/for.v
View File

@ -184,7 +184,7 @@ fn (p mut Parser) for_st() {
} }
p.fspace() p.fspace()
p.check(.lcbr) p.check(.lcbr)
//p.genln('') p.genln('') // TODO why is this needed?
p.statements() p.statements()
p.close_scope() p.close_scope()
p.for_expr_cnt-- p.for_expr_cnt--

7
vlib/compiler/parser.v
View File

@ -989,6 +989,10 @@ fn (p mut Parser) statements() string {
fn (p mut Parser) statements_no_rcbr() string { fn (p mut Parser) statements_no_rcbr() string {
p.open_scope() p.open_scope()
if !p.inside_if_expr {
//p.genln('')
}
mut i := 0 mut i := 0
mut last_st_typ := '' mut last_st_typ := ''
for p.tok != .rcbr && p.tok != .eof { for p.tok != .rcbr && p.tok != .eof {
@ -996,6 +1000,7 @@ fn (p mut Parser) statements_no_rcbr() string {
last_st_typ = p.statement(true) last_st_typ = p.statement(true)
// println('last st typ=$last_st_typ') // println('last st typ=$last_st_typ')
if !p.inside_if_expr { if !p.inside_if_expr {
//p.genln('')// // end st tok= ${p.strtok()}')
p.fgenln('') p.fgenln('')
} }
i++ i++
@ -2513,7 +2518,7 @@ fn (p mut Parser) if_st(is_expr bool, elif_depth int) string {
p.returns = false p.returns = false
if p.tok == .key_else { if p.tok == .key_else {
if !p.inside_if_expr { if !p.inside_if_expr {
//p.fgenln('') p.fgenln('')
} }
p.check(.key_else) p.check(.key_else)
p.fspace() p.fspace()