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

remove unnecessary empty lines in cgen

pull/2728/head
Alexander Medvednikov 2019-11-11 06:02:01 +03:00
parent 730ef96398
commit 0ad0a61db2
4 changed files with 5 additions and 10 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/fn.v
View File

@ -1114,10 +1114,10 @@ fn (p mut Parser) fn_call_args(f mut Fn) {
p.gen('}[0] ') p.gen('}[0] ')
} }
else if exp_ptr && expected == got + '*' { else if exp_ptr && expected == got + '*' {
$if !tinyc {
expr := p.cgen.cur_line[ph..] expr := p.cgen.cur_line[ph..]
// TODO hack // TODO hack
// If current expression is a func call, generate the array hack // If current expression is a func call, generate the array hack
$if !tinyc {
if expr.contains('(') { if expr.contains('(') {
//println('fn hack expr=$expr') //println('fn hack expr=$expr')
p.cgen.set_placeholder(ph, '& /*113 e="$expected" g="$got"*/ ($got[]){') p.cgen.set_placeholder(ph, '& /*113 e="$expected" g="$got"*/ ($got[]){')

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('')
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,10 +989,6 @@ 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 {
@ -1000,7 +996,6 @@ 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++
@ -2518,7 +2513,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()