TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-17 11:26:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

vfmt: ensure that by default stdout is used only for the formatted source

Browse Source 
and all errors go to stderr
This commit is contained in:
Delyan Angelov 2019-12-31 07:02:49 +02:00 committed by Alexander Medvednikov
parent 3a7f1db947
commit 3a2491e97f
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/vfmt.v
View File

@ -30,6 +30,7 @@ const (
['solaris', '_solaris.v'], ['solaris', '_solaris.v'],
['haiku', '_haiku.v'], ['haiku', '_haiku.v'],
] ]
FORMATTED_FILE_TOKEN = '\@\@\@' + 'FORMATTED_FILE: '
) )
fn main() { fn main() {
@ -96,13 +97,31 @@ fn main() {
if foptions.is_verbose { if foptions.is_verbose {
eprintln('vfmt worker_cmd: $worker_cmd') eprintln('vfmt worker_cmd: $worker_cmd')
} }
cmdcode := os.system(worker_cmd) worker_result := os.exec(worker_cmd) or {
if cmdcode != 0 { errors++
if cmdcode == 1 { continue
}
if worker_result.exit_code != 0 {
eprintln(worker_result.output)
if worker_result.exit_code == 1 {
eprintln('vfmt error while formatting file: $file .') eprintln('vfmt error while formatting file: $file .')
} }
errors++ errors++
continue
} }
if worker_result.output.len > 0 {
if worker_result.output.contains(FORMATTED_FILE_TOKEN) {
wresult := worker_result.output.split(FORMATTED_FILE_TOKEN)
formatted_warn_errs := wresult[0]
formatted_file_path := wresult[1]
foptions.post_process_file(fpath, formatted_file_path)
if formatted_warn_errs.len > 0 {
eprintln(formatted_warn_errs)
}
continue
}
}
errors++
} }
if errors > 0 { if errors > 0 {
eprintln('Encountered a total of: ${errors} errors.') eprintln('Encountered a total of: ${errors} errors.')
@ -160,6 +179,10 @@ fn (foptions &FormatOptions) format_file(file string) {
os.rm(cfile) os.rm(cfile)
} }
} }
eprintln('${FORMATTED_FILE_TOKEN}${formatted_file_path}')
}
fn (foptions &FormatOptions) post_process_file(file string, formatted_file_path string) {
if formatted_file_path.len == 0 { if formatted_file_path.len == 0 {
return return
} }
@ -205,10 +228,8 @@ fn (foptions &FormatOptions) format_file(file string) {
} }
return return
} }
else {
print(formatted_fc) print(formatted_fc)
} }
}
fn usage() { fn usage() {
print('Usage: tools/vfmt [flags] fmt path_to_source.v [path_to_other_source.v] print('Usage: tools/vfmt [flags] fmt path_to_source.v [path_to_other_source.v]