From 8947717e3ea3ea4682795fe427c70a8e85b45b91 Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Mon, 11 Nov 2019 06:06:49 +0300 Subject: [PATCH] fix the build --- vlib/compiler/cgen.v | 4 ++-- vlib/compiler/for.v | 2 +- vlib/compiler/parser.v | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/vlib/compiler/cgen.v b/vlib/compiler/cgen.v index daccde09f8..e9afb1d09f 100644 --- a/vlib/compiler/cgen.v +++ b/vlib/compiler/cgen.v @@ -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) { // former start_tmp() if p.cgen.is_tmp { @@ -117,7 +117,7 @@ fn (p mut Parser) tmp_expr() (string, string) { p.cgen.is_tmp = true // typ := p.bool_expression() - // former end_tmp() + res := p.cgen.tmp_line if p.cgen.prev_tmps.len > 0 { p.cgen.tmp_line = p.cgen.prev_tmps.last() diff --git a/vlib/compiler/for.v b/vlib/compiler/for.v index ea773d3461..c9b9848a79 100644 --- a/vlib/compiler/for.v +++ b/vlib/compiler/for.v @@ -184,7 +184,7 @@ fn (p mut Parser) for_st() { } p.fspace() p.check(.lcbr) - //p.genln('') + p.genln('') // TODO why is this needed? p.statements() p.close_scope() p.for_expr_cnt-- diff --git a/vlib/compiler/parser.v b/vlib/compiler/parser.v index 5829f0f701..e8765072c4 100644 --- a/vlib/compiler/parser.v +++ b/vlib/compiler/parser.v @@ -989,6 +989,10 @@ fn (p mut Parser) statements() string { fn (p mut Parser) statements_no_rcbr() string { p.open_scope() + + if !p.inside_if_expr { + //p.genln('') + } mut i := 0 mut last_st_typ := '' 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) // println('last st typ=$last_st_typ') if !p.inside_if_expr { + //p.genln('')// // end st tok= ${p.strtok()}') p.fgenln('') } i++ @@ -2513,7 +2518,7 @@ fn (p mut Parser) if_st(is_expr bool, elif_depth int) string { p.returns = false if p.tok == .key_else { if !p.inside_if_expr { - //p.fgenln('') + p.fgenln('') } p.check(.key_else) p.fspace()