sysutils/jq
sysutils/jq
1
0
Fork 0
mirror of https://github.com/jqlang/jq.git synced 2025-04-18 17:24:01 +03:00
Code

Include column number in parser and compiler error messages (#3257)

Browse Source 
Resolves #1027, resolves #2334, and resolves #3256.
This commit is contained in:
liviubobocu 2025-03-10 15:17:49 +02:00 committed by GitHub
parent 668871bdfa
commit 4b84a6e2f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/locfile.c
View File

@ -82,8 +82,9 @@ void locfile_locate(struct locfile* l, location loc, const char* fmt, ...) {
jv_free(m1);
return;
}
jv m2 = jv_string_fmt("%s at %s, line %d:\n%.*s%*s", jv_string_value(m1),
jv_string_value(l->fname), startline + 1,
jv m2 = jv_string_fmt("%s at %s, line %d, column %d:\n%.*s%*s",
jv_string_value(m1), jv_string_value(l->fname),
startline + 1, loc.start - offset + 1,
locfile_line_length(l, startline), l->data + offset,
loc.start - offset, "");
jv_free(m1);

28
tests/jq.test
View File

@ -117,11 +117,11 @@ null
%%FAIL
{(0):1}
jq: error: Cannot use number (0) as object key at <top-level>, line 1:
jq: error: Cannot use number (0) as object key at <top-level>, line 1, column 2:
%%FAIL
{non_const:., (0):1}
jq: error: Cannot use number (0) as object key at <top-level>, line 1:
jq: error: Cannot use number (0) as object key at <top-level>, line 1, column 15:
#
# Field access, piping
@ -300,7 +300,7 @@ null
%%FAIL
. as $foo | break $foo
jq: error: $*label-foo is not defined at <top-level>, line 1:
jq: error: $*label-foo is not defined at <top-level>, line 1, column 13:
[.[]|[.,1]|until(.[0] < 1; [.[0] - 1, .[1] * .[0]])|.[1]]
[1,2,3,4,5]
@ -506,11 +506,11 @@ null
%%FAIL IGNORE MSG
. as [] | null
jq: error: syntax error, unexpected ']', expecting '$' or '[' or '{' (Unix shell quoting issues?) at <top-level>, line 1:
jq: error: syntax error, unexpected ']', expecting '$' or '[' or '{' (Unix shell quoting issues?) at <top-level>, line 1, column 7:
%%FAIL IGNORE MSG
. as {} | null
jq: error: syntax error, unexpected '}' (Unix shell quoting issues?) at <top-level>, line 1:
jq: error: syntax error, unexpected '}' (Unix shell quoting issues?) at <top-level>, line 1, column 7:
# [.,(.[] | {x:.},.),.,.[]]
@ -1750,27 +1750,27 @@ null
%%FAIL
module (.+1); 0
jq: error: Module metadata must be constant at <top-level>, line 1:
jq: error: Module metadata must be constant at <top-level>, line 1, column 1:
%%FAIL
module []; 0
jq: error: Module metadata must be an object at <top-level>, line 1:
jq: error: Module metadata must be an object at <top-level>, line 1, column 1:
%%FAIL
include "a" (.+1); 0
jq: error: Module metadata must be constant at <top-level>, line 1:
jq: error: Module metadata must be constant at <top-level>, line 1, column 1:
%%FAIL
include "a" []; 0
jq: error: Module metadata must be an object at <top-level>, line 1:
jq: error: Module metadata must be an object at <top-level>, line 1, column 1:
%%FAIL
include "\ "; 0
jq: error: Invalid escape at line 1, column 4 (while parsing '"\ "') at <top-level>, line 1:
jq: error: Invalid escape at line 1, column 4 (while parsing '"\ "') at <top-level>, line 1, column 10:
%%FAIL
include "\(a)"; 0
jq: error: Import path must be constant at <top-level>, line 1:
jq: error: Import path must be constant at <top-level>, line 1, column 9:
modulemeta
"c"
@ -1786,11 +1786,11 @@ modulemeta | .defs | length
%%FAIL IGNORE MSG
import "syntaxerror" as e; .
jq: error: syntax error, unexpected ';', expecting $end (Unix shell quoting issues?) at /home/nico/ws/jq/tests/modules/syntaxerror/syntaxerror.jq, line 1:
jq: error: syntax error, unexpected ';', expecting $end (Unix shell quoting issues?) at /home/nico/ws/jq/tests/modules/syntaxerror/syntaxerror.jq, line 1, column 8:
%%FAIL IGNORE MSG
%::wat
jq: error: syntax error, unexpected '%', expecting $end (Unix shell quoting issues?) at <top-level>, line 1:
jq: error: syntax error, unexpected '%', expecting $end (Unix shell quoting issues?) at <top-level>, line 1, column 1:
import "test_bind_order" as check; check::check
null
@ -1871,7 +1871,7 @@ null
%%FAIL IGNORE MSG
}
jq: error: syntax error, unexpected INVALID_CHARACTER, expecting $end (Unix shell quoting issues?) at <top-level>, line 1:
jq: error: syntax error, unexpected INVALID_CHARACTER, expecting $end (Unix shell quoting issues?) at <top-level>, line 1, column 1:
(.[{}] = 0)?
null