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

vfmt: ignore parser warnings, cleanup code

master
Delyan Angelov 2022-04-23 11:10:12 +03:00
parent d934472b17
commit 365e7d6b34
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
cmd/tools/vfmt.v
View File

@ -61,9 +61,7 @@ fn main() {
if term_colors { if term_colors {
os.setenv('VCOLORS', 'always', true) os.setenv('VCOLORS', 'always', true)
} }
if foptions.is_verbose { foptions.vlog('vfmt foptions: $foptions')
eprintln('vfmt foptions: $foptions')
}
if foptions.is_worker { if foptions.is_worker {
// -worker should be added by a parent vfmt process. // -worker should be added by a parent vfmt process.
// We launch a sub process for each file because // We launch a sub process for each file because
@ -109,9 +107,7 @@ fn main() {
mut worker_command_array := cli_args_no_files.clone() mut worker_command_array := cli_args_no_files.clone()
worker_command_array << ['-worker', util.quote_path(fpath)] worker_command_array << ['-worker', util.quote_path(fpath)]
worker_cmd := worker_command_array.join(' ') worker_cmd := worker_command_array.join(' ')
if foptions.is_verbose { foptions.vlog('vfmt worker_cmd: $worker_cmd')
eprintln('vfmt worker_cmd: $worker_cmd')
}
worker_result := os.execute(worker_cmd) worker_result := os.execute(worker_cmd)
// Guard against a possibly crashing worker process. // Guard against a possibly crashing worker process.
if worker_result.exit_code != 0 { if worker_result.exit_code != 0 {
@ -151,43 +147,43 @@ fn main() {
} }
} }
fn (foptions &FormatOptions) format_file(file string) { fn setup_preferences_and_table() (&pref.Preferences, &ast.Table) {
table := ast.new_table()
mut prefs := pref.new_preferences() mut prefs := pref.new_preferences()
prefs.is_fmt = true prefs.is_fmt = true
prefs.skip_warnings = true
return prefs, table
}
fn (foptions &FormatOptions) vlog(msg string) {
if foptions.is_verbose { if foptions.is_verbose {
eprintln('vfmt2 running fmt.fmt over file: $file') eprintln(msg)
} }
table := ast.new_table() }
// checker := checker.new_checker(table, prefs)
fn (foptions &FormatOptions) format_file(file string) {
foptions.vlog('vfmt2 running fmt.fmt over file: $file')
prefs, table := setup_preferences_and_table()
file_ast := parser.parse_file(file, table, .parse_comments, prefs) file_ast := parser.parse_file(file, table, .parse_comments, prefs)
// checker.check(file_ast) // checker.new_checker(table, prefs).check(file_ast)
formatted_content := fmt.fmt(file_ast, table, prefs, foptions.is_debug) formatted_content := fmt.fmt(file_ast, table, prefs, foptions.is_debug)
file_name := os.file_name(file) file_name := os.file_name(file)
ulid := rand.ulid() ulid := rand.ulid()
vfmt_output_path := os.join_path(vtmp_folder, 'vfmt_${ulid}_$file_name') vfmt_output_path := os.join_path(vtmp_folder, 'vfmt_${ulid}_$file_name')
os.write_file(vfmt_output_path, formatted_content) or { panic(err) } os.write_file(vfmt_output_path, formatted_content) or { panic(err) }
if foptions.is_verbose { foptions.vlog('fmt.fmt worked and $formatted_content.len bytes were written to $vfmt_output_path .')
eprintln('fmt.fmt worked and $formatted_content.len bytes were written to $vfmt_output_path .')
}
eprintln('$formatted_file_token$vfmt_output_path') eprintln('$formatted_file_token$vfmt_output_path')
} }
fn (foptions &FormatOptions) format_pipe() { fn (foptions &FormatOptions) format_pipe() {
mut prefs := pref.new_preferences() foptions.vlog('vfmt2 running fmt.fmt over stdin')
prefs.is_fmt = true prefs, table := setup_preferences_and_table()
if foptions.is_verbose {
eprintln('vfmt2 running fmt.fmt over stdin')
}
input_text := os.get_raw_lines_joined() input_text := os.get_raw_lines_joined()
table := ast.new_table()
// checker := checker.new_checker(table, prefs)
file_ast := parser.parse_text(input_text, '', table, .parse_comments, prefs) file_ast := parser.parse_text(input_text, '', table, .parse_comments, prefs)
// checker.check(file_ast) // checker.new_checker(table, prefs).check(file_ast)
formatted_content := fmt.fmt(file_ast, table, prefs, foptions.is_debug) formatted_content := fmt.fmt(file_ast, table, prefs, foptions.is_debug)
print(formatted_content) print(formatted_content)
if foptions.is_verbose { foptions.vlog('fmt.fmt worked and $formatted_content.len bytes were written to stdout.')
eprintln('fmt.fmt worked and $formatted_content.len bytes were written to stdout.')
}
} }
fn print_compiler_options(compiler_params &pref.Preferences) { fn print_compiler_options(compiler_params &pref.Preferences) {
@ -234,9 +230,7 @@ fn (mut foptions FormatOptions) post_process_file(file string, formatted_file_pa
return return
} }
diff_cmd := foptions.find_diff_cmd() diff_cmd := foptions.find_diff_cmd()
if foptions.is_verbose { foptions.vlog('Using diff command: $diff_cmd')
eprintln('Using diff command: $diff_cmd')
}
diff := diff.color_compare_files(diff_cmd, file, formatted_file_path) diff := diff.color_compare_files(diff_cmd, file, formatted_file_path)
if diff.len > 0 { if diff.len > 0 {
println(diff) println(diff)