navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-30 10:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error messages to show problematic position in the filter (#3292)

Browse Source 
This commit improves the parser and compiler error messages, making
it more easier to understand where in the filter the problem is.
Like modern compilers, jq will show the line in the filter where the
error occurred, will display squiggly line under the invalid token.
This commit is contained in:
itchyny authored and GitHub committed 2025-05-18 16:36:32 +09:00
1 parent c350566001
commit b733dfaee7
6 files changed
+801 -735
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/parser.y
+9 -17
View File
@@ -139,15 +139,7 @@ struct lexer_param {
void yyerror(YYLTYPE* loc, block* answer, int* errors,
struct locfile* locations, struct lexer_param* lexer_param_ptr, const char *s){
(*errors)++;
if (strstr(s, "unexpected")) {
#ifdef WIN32
locfile_locate(locations, *loc, "jq: error: %s (Windows cmd shell quoting issues?)", s);
#else
locfile_locate(locations, *loc, "jq: error: %s (Unix shell quoting issues?)", s);
#endif
} else {
locfile_locate(locations, *loc, "jq: error: %s", s);
}
locfile_locate(locations, *loc, "jq: error: %s", s);
}
int yylex(YYSTYPE* yylval, YYLTYPE* yylloc, block* answer, int* errors,
@@ -300,11 +292,11 @@ Module:
} |
"module" Query ';' {
if (!block_is_const($2)) {
FAIL(@$, "Module metadata must be constant");
FAIL(@2, "Module metadata must be constant");
$$ = gen_noop();
block_free($2);
} else if (block_const_kind($2) != JV_KIND_OBJECT) {
FAIL(@$, "Module metadata must be an object");
FAIL(@2, "Module metadata must be an object");
$$ = gen_noop();
block_free($2);
} else {
@@ -431,12 +423,12 @@ ImportWhat ';' {
} |
ImportWhat Query ';' {
if (!block_is_const($2)) {
FAIL(@$, "Module metadata must be constant");
FAIL(@2, "Module metadata must be constant");
$$ = gen_noop();
block_free($1);
block_free($2);
} else if (block_const_kind($2) != JV_KIND_OBJECT) {
FAIL(@$, "Module metadata must be an object");
FAIL(@2, "Module metadata must be an object");
$$ = gen_noop();
block_free($1);
block_free($2);
@@ -472,7 +464,7 @@ ImportWhat:
ImportFrom:
String {
if (!block_is_const($1)) {
FAIL(@$, "Import path must be constant");
FAIL(@1, "Import path must be constant");
$$ = gen_const(jv_string(""));
block_free($1);
} else {
@@ -826,7 +818,7 @@ String ':' Pattern {
'(' Query ')' ':' Pattern {
jv msg = check_object_key($2);
if (jv_is_valid(msg)) {
FAIL(@$, jv_string_value(msg));
FAIL(@2, jv_string_value(msg));
}
jv_free(msg);
$$ = gen_object_matcher($2, $5);
@@ -942,13 +934,13 @@ Keyword {
'(' Query ')' ':' DictExpr {
jv msg = check_object_key($2);
if (jv_is_valid(msg)) {
FAIL(@$, jv_string_value(msg));
FAIL(@2, jv_string_value(msg));
}
jv_free(msg);
$$ = gen_dictpair($2, $5);
} |
error ':' DictExpr {
FAIL(@$, "May need parentheses around object key expression");
FAIL(@1, "May need parentheses around object key expression");
$$ = $3;
}