mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

compiler: produce errors in C "filepath:line:column:" format

Browse Source
This commit is contained in:
Delyan Angelov
2019-08-22 14:15:11 +03:00
committed by Alexander Medvednikov
parent 9b3b22d6b3
commit 77b31de117
5 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/scanner.v
View File

@ -332,7 +332,7 @@ fn (s mut Scanner) scan() ScanRes {
// TODO allow double quotes
// case QUOTE:
// return scan_res(.str, s.ident_string())
case `\``:
case `\``: // ` // apostrophe balance comment. do not remove
return scan_res(.chartoken, s.ident_char())
case `(`:
return scan_res(.lpar, '')
@ -563,9 +563,26 @@ fn (s mut Scanner) scan() ScanRes {
return scan_res(.eof, '')
}
fn (s &Scanner) find_current_line_start_position() int {
mut linestart := s.pos
for {
if linestart <= 0 {break}
if s.text[linestart] == 10 || s.text[linestart] == 13 { break }
linestart--
}
return linestart
}
fn (s &Scanner) error(msg string) {
file := s.file_path.all_after('/')
println('$file:${s.line_nr + 1} $msg')
fullpath := os.realpath( s.file_path )
column := s.pos - s.find_current_line_start_position()
// The filepath:line:col: format is the default C compiler
// error output format. It allows editors and IDE's like
// emacs to quickly find the errors in the output
// and jump to their source with a keyboard shortcut.
// Using only the filename leads to inability of IDE/editors
// to find the source file, when it is in another folder.
println('${fullpath}:${s.line_nr + 1}:$column: $msg')
exit(1)
}
@ -655,7 +672,7 @@ fn (s mut Scanner) ident_char() string {
len++
}
double_slash := s.expect('\\\\', s.pos - 2)
if s.text[s.pos] == `\`` && (s.text[s.pos - 1] != slash || double_slash) {
if s.text[s.pos] == `\`` && (s.text[s.pos - 1] != slash || double_slash) { // ` // apostrophe balance comment. do not remove
if double_slash {
len++
}
@ -754,7 +771,7 @@ fn (s mut Scanner) get_opening_bracket() int {
if s.text[pos] == `(` && !inside_string {
parentheses--
}
if s.text[pos] == `\'` && s.text[pos - 1] != `\\` && s.text[pos - 1] != `\`` {
if s.text[pos] == `\'` && s.text[pos - 1] != `\\` && s.text[pos - 1] != `\`` { // ` // apostrophe balance comment. do not remove
inside_string = !inside_string
}
if parentheses == 0 {

2
compiler/tests/repl/error.repl
View File

@ -1,3 +1,3 @@
println(a)
===output===
.vrepl.v:2 undefined: `a`
.vrepl.v:2:9: undefined: `a`

2
compiler/tests/repl/error_nosave.repl
View File

@ -1,5 +1,5 @@
a
33
===output===
.vrepl_temp.v:2 undefined: `a`
.vrepl_temp.v:2:9: undefined: `a`
33

6
compiler/tests/repl/repl_test.v
View File

@ -2,7 +2,7 @@ import os
fn test_repl() {
test_files := os.walk_ext('.', '.repl')
wd := os.getwd() + '/'
for file in test_files {
content := os.read_file(file) or {
assert false
@ -19,7 +19,7 @@ fn test_repl() {
assert false
break
}
result := r.output.replace('>>> ', '').replace('>>>', '').replace('... ', '').all_after('Use Ctrl-C or `exit` to exit\n')
result := r.output.replace('>>> ', '').replace('>>>', '').replace('... ', '').all_after('Use Ctrl-C or `exit` to exit\n').replace( wd, '' )
assert result == output
if result != output {
println(file)
@ -27,4 +27,4 @@ fn test_repl() {
println('Expected : $output')
}
}
}
}