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

run vfmt on parser.v

pull/3130/head
Alexander Medvednikov 2019-12-18 04:34:50 +03:00
parent ad211a86a6
commit a46a2e4715
2 changed files with 809 additions and 780 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1580
vlib/compiler/parser.v
View File

File diff suppressed because it is too large Load Diff

9
vlib/compiler/vfmt.v
View File

@ -10,10 +10,12 @@ import os
[if vfmt] [if vfmt]
fn (scanner mut Scanner) fgen(s_ string) { fn (scanner mut Scanner) fgen(s_ string) {
mut s := s_ mut s := s_
if s != ' ' {
//s = s.trim_space()
}
if scanner.fmt_line_empty { if scanner.fmt_line_empty {
s = strings.repeat(`\t`, scanner.fmt_indent) + s.trim_left(' ') s = strings.repeat(`\t`, scanner.fmt_indent) + s.trim_left(' ')
} }
scanner.fmt_lines << s scanner.fmt_lines << s
//scanner.fmt_out << s //scanner.fmt_out << s
//scanner.fmt_out.write(s) //scanner.fmt_out.write(s)
@ -22,7 +24,7 @@ fn (scanner mut Scanner) fgen(s_ string) {
[if vfmt] [if vfmt]
fn (scanner mut Scanner) fgenln(s_ string) { fn (scanner mut Scanner) fgenln(s_ string) {
mut s := s_ mut s := s_//.trim_space()
if scanner.fmt_line_empty && scanner.fmt_indent > 0 { if scanner.fmt_line_empty && scanner.fmt_indent > 0 {
s = strings.repeat(`\t`, scanner.fmt_indent) + s s = strings.repeat(`\t`, scanner.fmt_indent) + s
} }
@ -227,7 +229,8 @@ fn (p &Parser) gen_fmt() {
} }
//s := p.scanner.fmt_out.str().replace('\n\n\n', '\n').trim_space() //s := p.scanner.fmt_out.str().replace('\n\n\n', '\n').trim_space()
//s := p.scanner.fmt_out.str().trim_space() //s := p.scanner.fmt_out.str().trim_space()
s := p.scanner.fmt_lines.join('').trim_space() s := p.scanner.fmt_lines.join('').trim_space().replace('\n\n\n\n', '\n\n')
.replace(' \n', '\n')
if s == '' { if s == '' {
return return
} }