From 8e5067421fe71a60694c5a1a1808c6d9f9d30543 Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Tue, 6 Oct 2020 10:02:35 +0300 Subject: [PATCH] vet: accumulate the collected errors manually (fixes CI) --- cmd/tools/vvet.v | 2 +- vlib/v/parser/parser.v | 1 + vlib/v/scanner/scanner.v | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmd/tools/vvet.v b/cmd/tools/vvet.v index 39abeed85b..2edea73fd5 100644 --- a/cmd/tools/vvet.v +++ b/cmd/tools/vvet.v @@ -70,6 +70,6 @@ fn (mut vet_options VetOptions) vet_file(path string) { table := table.new_table() vet_options.vprintln("vetting file '$path'...") file_ast, errors := parser.parse_vet_file(path, table, prefs) - vet_options.errors = errors + vet_options.errors << errors vet.vet(file_ast, table, true) } diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v index e8446244ba..084657153f 100644 --- a/vlib/v/parser/parser.v +++ b/vlib/v/parser/parser.v @@ -149,6 +149,7 @@ pub fn parse_vet_file(path string, table_ &table.Table, pref &pref.Preferences) } } file := p.parse() + p.vet_errors << p.scanner.vet_errors return file, p.vet_errors } diff --git a/vlib/v/scanner/scanner.v b/vlib/v/scanner/scanner.v index d318bab8ea..78381f6511 100644 --- a/vlib/v/scanner/scanner.v +++ b/vlib/v/scanner/scanner.v @@ -1394,10 +1394,6 @@ pub fn (s &Scanner) error(msg string) { fn (mut s Scanner) vet_error(msg string) { eline := '$s.file_path:$s.line_nr: $msg' - if s.vet_errors.len == 0 { - eprintln(eline) - return - } s.vet_errors << eline }