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

vet, parser: remove vet_errors and vet_notices from parser (#21424)

Browse Source
This commit is contained in:
Turiiya 2024-05-05 20:24:26 +02:00 committed by GitHub
parent 44c84f6187
commit 58527cc71c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/tools/vvet/vvet.v
View File

@ -110,11 +110,10 @@ fn (mut vt Vet) vet_file(path string) {
prefs.is_vsh = path.ends_with('.vsh') prefs.is_vsh = path.ends_with('.vsh')
mut table := ast.new_table() mut table := ast.new_table()
vt.vprintln("vetting file '${path}'...") vt.vprintln("vetting file '${path}'...")
file, errors, notices := parser.parse_vet_file(path, mut table, prefs) file, errors := parser.parse_vet_file(path, mut table, prefs)
vt.stmts(file.stmts) vt.stmts(file.stmts)
// Transfer errors from scanner and parser // Transfer errors from scanner and parser
vt.errors << errors vt.errors << errors
vt.notices << notices
source_lines := os.read_lines(vt.file) or { []string{} } source_lines := os.read_lines(vt.file) or { []string{} }
for ln, line in source_lines { for ln, line in source_lines {
vt.vet_line(source_lines, line, ln) vt.vet_line(source_lines, line, ln)

36
vlib/v/parser/parser.v
View File

@ -112,8 +112,6 @@ pub mut:
errors []errors.Error errors []errors.Error
warnings []errors.Warning warnings []errors.Warning
notices []errors.Notice notices []errors.Notice
vet_errors []vet.Error
vet_notices []vet.Error
template_paths []string // record all compiled $tmpl files; needed for `v watch run webserver.v` template_paths []string // record all compiled $tmpl files; needed for `v watch run webserver.v`
} }
@ -259,7 +257,7 @@ pub fn parse_file(path string, mut table ast.Table, comments_mode scanner.Commen
return res return res
} }
pub fn parse_vet_file(path string, mut table_ ast.Table, pref_ &pref.Preferences) (&ast.File, []vet.Error, []vet.Error) { pub fn parse_vet_file(path string, mut table_ ast.Table, pref_ &pref.Preferences) (&ast.File, []vet.Error) {
$if trace_parse_vet_file ? { $if trace_parse_vet_file ? {
eprintln('> ${@MOD}.${@FN} path: ${path}') eprintln('> ${@MOD}.${@FN} path: ${path}')
} }
@ -278,10 +276,10 @@ pub fn parse_vet_file(path string, mut table_ ast.Table, pref_ &pref.Preferences
warnings: []errors.Warning{} warnings: []errors.Warning{}
} }
p.set_path(path) p.set_path(path)
p.vet_errors << p.scanner.vet_errors vet_errors := p.scanner.vet_errors
file := p.parse() file := p.parse()
unsafe { p.free_scanner() } unsafe { p.free_scanner() }
return file, p.vet_errors, p.vet_notices return file, vet_errors
} }
pub fn (mut p Parser) parse() &ast.File { pub fn (mut p Parser) parse() &ast.File {
@ -2152,34 +2150,6 @@ fn (mut p Parser) note_with_pos(s string, pos token.Pos) {
} }
} }
fn (mut p Parser) vet_error(msg string, line int, fix vet.FixKind, typ vet.ErrorType) {
pos := token.Pos{
line_nr: line + 1
}
p.vet_errors << vet.Error{
message: msg
file_path: p.scanner.file_path
pos: pos
kind: .error
fix: fix
typ: typ
}
}
fn (mut p Parser) vet_notice(msg string, line int, fix vet.FixKind, typ vet.ErrorType) {
pos := token.Pos{
line_nr: line + 1
}
p.vet_notices << vet.Error{
message: msg
file_path: p.scanner.file_path
pos: pos
kind: .notice
fix: fix
typ: typ
}
}
fn (mut p Parser) parse_multi_expr(is_top_level bool) ast.Stmt { fn (mut p Parser) parse_multi_expr(is_top_level bool) ast.Stmt {
// in here might be 1) multi-expr 2) multi-assign // in here might be 1) multi-expr 2) multi-assign
// 1, a, c ... } // multi-expression // 1, a, c ... } // multi-expression