github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add length to the parse_util syntax errors

Browse Source
This commit is contained in:
Fabian Boehm 2022-08-12 16:53:31 +02:00
parent 4b921cbc08
commit 232ca25ff9
5 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/parse_util.cpp
View File

@ -809,12 +809,12 @@ std::vector<int> parse_util_compute_indents(const wcstring &src) {
} }
/// Append a syntax error to the given error list. /// Append a syntax error to the given error list.
static bool append_syntax_error(parse_error_list_t *errors, size_t source_location, static bool append_syntax_error(parse_error_list_t *errors, size_t source_location, size_t source_length,
const wchar_t *fmt, ...) { const wchar_t *fmt, ...) {
if (!errors) return true; if (!errors) return true;
parse_error_t error; parse_error_t error;
error.source_start = source_location; error.source_start = source_location;
error.source_length = 0; error.source_length = source_length;
error.code = parse_error_syntax; error.code = parse_error_syntax;
va_list va; va_list va;
@ -901,11 +901,11 @@ void parse_util_expand_variable_error(const wcstring &token, size_t global_token
} }
if (looks_like_variable) { if (looks_like_variable) {
append_syntax_error( append_syntax_error(
errors, global_after_dollar_pos, errors, global_after_dollar_pos, 1,
double_quotes ? ERROR_BRACKETED_VARIABLE_QUOTED1 : ERROR_BRACKETED_VARIABLE1, double_quotes ? ERROR_BRACKETED_VARIABLE_QUOTED1 : ERROR_BRACKETED_VARIABLE1,
truncate(var_name, var_err_len).c_str()); truncate(var_name, var_err_len).c_str());
} else { } else {
append_syntax_error(errors, global_after_dollar_pos, ERROR_BAD_VAR_CHAR1, L'{'); append_syntax_error(errors, global_after_dollar_pos, 1, ERROR_BAD_VAR_CHAR1, L'{');
} }
break; break;
} }
@ -913,11 +913,11 @@ void parse_util_expand_variable_error(const wcstring &token, size_t global_token
// e.g.: echo foo"$"baz // e.g.: echo foo"$"baz
// These are only ever quotes, not command substitutions. Command substitutions are // These are only ever quotes, not command substitutions. Command substitutions are
// handled earlier. // handled earlier.
append_syntax_error(errors, global_dollar_pos, ERROR_NO_VAR_NAME); append_syntax_error(errors, global_dollar_pos, 1, ERROR_NO_VAR_NAME);
break; break;
} }
case L'\0': { case L'\0': {
append_syntax_error(errors, global_dollar_pos, ERROR_NO_VAR_NAME); append_syntax_error(errors, global_dollar_pos, 1, ERROR_NO_VAR_NAME);
break; break;
} }
default: { default: {
@ -932,7 +932,7 @@ void parse_util_expand_variable_error(const wcstring &token, size_t global_token
// arguments we pass but that's harmless. // arguments we pass but that's harmless.
const wchar_t *error_fmt = error_format_for_character(token_stop_char); const wchar_t *error_fmt = error_format_for_character(token_stop_char);
append_syntax_error(errors, global_after_dollar_pos, error_fmt, token_stop_char); append_syntax_error(errors, global_after_dollar_pos, 1, error_fmt, token_stop_char);
break; break;
} }
} }
@ -957,8 +957,8 @@ parser_test_error_bits_t parse_util_detect_errors_in_argument(const ast::argumen
wcstring unesc; wcstring unesc;
if (!unescape_string(arg_src.c_str() + begin, end - begin, &unesc, UNESCAPE_SPECIAL)) { if (!unescape_string(arg_src.c_str() + begin, end - begin, &unesc, UNESCAPE_SPECIAL)) {
if (out_errors) { if (out_errors) {
append_syntax_error(out_errors, source_start + begin, L"Invalid token '%ls'", append_syntax_error(out_errors, source_start + begin, end - begin,
arg_src.c_str()); L"Invalid token '%ls'", arg_src.c_str());
} }
return 1; return 1;
} }
@ -1006,7 +1006,7 @@ parser_test_error_bits_t parse_util_detect_errors_in_argument(const ast::argumen
case -1: { case -1: {
err |= PARSER_TEST_ERROR; err |= PARSER_TEST_ERROR;
if (out_errors) { if (out_errors) {
append_syntax_error(out_errors, source_start, L"Mismatched parenthesis"); append_syntax_error(out_errors, source_start, 1, L"Mismatched parenthesis");
} }
return err; return err;
} }
@ -1061,10 +1061,10 @@ static bool detect_errors_in_backgrounded_job(const ast::job_t &job,
if (!job_conj) return false; if (!job_conj) return false;
if (job_conj->parent->try_as<if_clause_t>()) { if (job_conj->parent->try_as<if_clause_t>()) {
errored = append_syntax_error(parse_errors, source_range->start, errored = append_syntax_error(parse_errors, source_range->start, source_range->length,
BACKGROUND_IN_CONDITIONAL_ERROR_MSG); BACKGROUND_IN_CONDITIONAL_ERROR_MSG);
} else if (job_conj->parent->try_as<while_header_t>()) { } else if (job_conj->parent->try_as<while_header_t>()) {
errored = append_syntax_error(parse_errors, source_range->start, errored = append_syntax_error(parse_errors, source_range->start, source_range->length,
BACKGROUND_IN_CONDITIONAL_ERROR_MSG); BACKGROUND_IN_CONDITIONAL_ERROR_MSG);
} else if (const ast::job_list_t *jlist = job_conj->parent->try_as<ast::job_list_t>()) { } else if (const ast::job_list_t *jlist = job_conj->parent->try_as<ast::job_list_t>()) {
// This isn't very complete, e.g. we don't catch 'foo & ; not and bar'. // This isn't very complete, e.g. we don't catch 'foo & ; not and bar'.
@ -1082,7 +1082,7 @@ static bool detect_errors_in_backgrounded_job(const ast::job_t &job,
(deco->kw == parse_keyword_t::kw_and || deco->kw == parse_keyword_t::kw_or) && (deco->kw == parse_keyword_t::kw_and || deco->kw == parse_keyword_t::kw_or) &&
"Unexpected decorator keyword"); "Unexpected decorator keyword");
const wchar_t *deco_name = (deco->kw == parse_keyword_t::kw_and ? L"and" : L"or"); const wchar_t *deco_name = (deco->kw == parse_keyword_t::kw_and ? L"and" : L"or");
errored = append_syntax_error(parse_errors, deco->source_range().start, errored = append_syntax_error(parse_errors, deco->source_range().start, deco->source_range().length,
BOOL_AFTER_BACKGROUND_ERROR_MSG, deco_name); BOOL_AFTER_BACKGROUND_ERROR_MSG, deco_name);
} }
} }
@ -1099,6 +1099,7 @@ static bool detect_errors_in_decorated_statement(const wcstring &buff_src,
using namespace ast; using namespace ast;
bool errored = false; bool errored = false;
auto source_start = dst.source_range().start; auto source_start = dst.source_range().start;
auto source_length = dst.source_range().length;
const statement_decoration_t decoration = dst.decoration(); const statement_decoration_t decoration = dst.decoration();
// Determine if the first argument is help. // Determine if the first argument is help.
@ -1133,7 +1134,7 @@ static bool detect_errors_in_decorated_statement(const wcstring &buff_src,
bool is_in_pipeline = (pipe_pos != pipeline_position_t::none); bool is_in_pipeline = (pipe_pos != pipeline_position_t::none);
if (is_in_pipeline && decoration == statement_decoration_t::exec) { if (is_in_pipeline && decoration == statement_decoration_t::exec) {
errored = errored =
append_syntax_error(parse_errors, source_start, INVALID_PIPELINE_CMD_ERR_MSG, L"exec"); append_syntax_error(parse_errors, source_start, source_length, INVALID_PIPELINE_CMD_ERR_MSG, L"exec");
} }
// This is a somewhat stale check that 'and' and 'or' are not in pipelines, except at the // This is a somewhat stale check that 'and' and 'or' are not in pipelines, except at the
@ -1144,13 +1145,13 @@ static bool detect_errors_in_decorated_statement(const wcstring &buff_src,
// commands. // commands.
const wcstring &command = dst.command.source(buff_src, storage); const wcstring &command = dst.command.source(buff_src, storage);
if (command == L"and" || command == L"or") { if (command == L"and" || command == L"or") {
errored = append_syntax_error(parse_errors, source_start, INVALID_PIPELINE_CMD_ERR_MSG, errored = append_syntax_error(parse_errors, source_start, source_length, INVALID_PIPELINE_CMD_ERR_MSG,
command.c_str()); command.c_str());
} }
// Similarly for time (#8841). // Similarly for time (#8841).
if (command == L"time") { if (command == L"time") {
errored = append_syntax_error(parse_errors, source_start, TIME_IN_PIPELINE_ERR_MSG); errored = append_syntax_error(parse_errors, source_start, source_length, TIME_IN_PIPELINE_ERR_MSG);
} }
} }
@ -1160,7 +1161,7 @@ static bool detect_errors_in_decorated_statement(const wcstring &buff_src,
const wcstring &com = dst.command.source(buff_src, storage); const wcstring &com = dst.command.source(buff_src, storage);
if (com == L"$status") { if (com == L"$status") {
errored = errored =
append_syntax_error(parse_errors, source_start, append_syntax_error(parse_errors, source_start, source_length,
_(L"$status is not valid as a command. See `help conditions`")); _(L"$status is not valid as a command. See `help conditions`"));
} }
@ -1178,7 +1179,7 @@ static bool detect_errors_in_decorated_statement(const wcstring &buff_src,
// Check that pipes are sound. // Check that pipes are sound.
if (!errored && parser_is_pipe_forbidden(command) && is_in_pipeline) { if (!errored && parser_is_pipe_forbidden(command) && is_in_pipeline) {
errored = append_syntax_error(parse_errors, source_start, INVALID_PIPELINE_CMD_ERR_MSG, errored = append_syntax_error(parse_errors, source_start, source_length, INVALID_PIPELINE_CMD_ERR_MSG,
command.c_str()); command.c_str());
} }
@ -1208,7 +1209,7 @@ static bool detect_errors_in_decorated_statement(const wcstring &buff_src,
if (!found_loop) { if (!found_loop) {
errored = append_syntax_error( errored = append_syntax_error(
parse_errors, source_start, parse_errors, source_start, source_length,
(command == L"break" ? INVALID_BREAK_ERR_MSG : INVALID_CONTINUE_ERR_MSG)); (command == L"break" ? INVALID_BREAK_ERR_MSG : INVALID_CONTINUE_ERR_MSG));
} }
} }
@ -1219,7 +1220,7 @@ static bool detect_errors_in_decorated_statement(const wcstring &buff_src,
if (expand_one(command, expand_flag::skip_cmdsubst, operation_context_t::empty(), if (expand_one(command, expand_flag::skip_cmdsubst, operation_context_t::empty(),
parse_errors) && parse_errors) &&
!builtin_exists(unexp_command)) { !builtin_exists(unexp_command)) {
errored = append_syntax_error(parse_errors, source_start, UNKNOWN_BUILTIN_ERR_MSG, errored = append_syntax_error(parse_errors, source_start, source_length, UNKNOWN_BUILTIN_ERR_MSG,
unexp_command.c_str()); unexp_command.c_str());
} }
} }
@ -1240,7 +1241,7 @@ static bool detect_errors_in_decorated_statement(const wcstring &buff_src,
static bool detect_errors_in_block_redirection_list( static bool detect_errors_in_block_redirection_list(
const ast::argument_or_redirection_list_t &args_or_redirs, parse_error_list_t *out_errors) { const ast::argument_or_redirection_list_t &args_or_redirs, parse_error_list_t *out_errors) {
if (const auto *first_arg = get_first_arg(args_or_redirs)) { if (const auto *first_arg = get_first_arg(args_or_redirs)) {
return append_syntax_error(out_errors, first_arg->source_range().start, END_ARG_ERR_MSG); return append_syntax_error(out_errors, first_arg->source_range().start, first_arg->source_range().length, END_ARG_ERR_MSG);
} }
return false; return false;
} }

4
tests/checks/basic.fish
View File

@ -562,9 +562,9 @@ end
$fish -c 'echo \xtest' $fish -c 'echo \xtest'
# CHECKERR: fish: Invalid token '\xtest' # CHECKERR: fish: Invalid token '\xtest'
# CHECKERR: echo \xtest # CHECKERR: echo \xtest
# CHECKERR: ^ # CHECKERR: ^~~~~^
$fish -c 'echo \utest' $fish -c 'echo \utest'
# CHECKERR: fish: Invalid token '\utest' # CHECKERR: fish: Invalid token '\utest'
# CHECKERR: echo \utest # CHECKERR: echo \utest
# CHECKERR: ^ # CHECKERR: ^~~~~^

2
tests/checks/invocation.fish
View File

@ -82,7 +82,7 @@ and echo matched
$fish --no-config -c 'echo notprinted; echo foo | exec true; echo banana' $fish --no-config -c 'echo notprinted; echo foo | exec true; echo banana'
# CHECKERR: fish: The 'exec' command can not be used in a pipeline # CHECKERR: fish: The 'exec' command can not be used in a pipeline
# CHECKERR: echo notprinted; echo foo | exec true; echo banana # CHECKERR: echo notprinted; echo foo | exec true; echo banana
# CHECKERR: ^ # CHECKERR: ^~~~~~~~^
# Running multiple command lists continues even if one has a syntax error. # Running multiple command lists continues even if one has a syntax error.
$fish --no-config -c 'echo $$ oh no syntax error' -c 'echo this works' $fish --no-config -c 'echo $$ oh no syntax error' -c 'echo this works'

6
tests/checks/syntax-error-location.fish
View File

@ -9,12 +9,12 @@ $status
# CHECK: <fish: The 'exec' command can not be used in a pipeline> # CHECK: <fish: The 'exec' command can not be used in a pipeline>
# CHECK: <echo foo | exec grep # this exec is not allowed!> # CHECK: <echo foo | exec grep # this exec is not allowed!>
# CHECK: < ^> # CHECK: < ^~~~~~~~^>
echo 'true | time false' | $fish 2>| string replace -r '(.*)' '<$1>' echo 'true | time false' | $fish 2>| string replace -r '(.*)' '<$1>'
# CHECK: <fish: The 'time' command may only be at the beginning of a pipeline> # CHECK: <fish: The 'time' command may only be at the beginning of a pipeline>
# CHECK: <true | time false> # CHECK: <true | time false>
# CHECK: < ^> # CHECK: < ^~~~~~~~~^>
echo ' echo '
@ -42,7 +42,7 @@ $fish -c 'echo "unfinished "$(subshell' 2>| string replace -r '.*' '<$0>'
$fish -c 'echo "ok $(echo still ok)syntax error: \x"' 2>| string replace -r '.*' '<$0>' $fish -c 'echo "ok $(echo still ok)syntax error: \x"' 2>| string replace -r '.*' '<$0>'
# CHECK: <fish: Invalid token '"ok $(echo still ok)syntax error: \x"'> # CHECK: <fish: Invalid token '"ok $(echo still ok)syntax error: \x"'>
# CHECK: <echo "ok $(echo still ok)syntax error: \x"> # CHECK: <echo "ok $(echo still ok)syntax error: \x">
# CHECK: < ^> # CHECK: < ^~~~~~~~~~~~~~~~^>
echo "function this_should_be_an_error" >$TMPDIR/this_should_be_an_error.fish echo "function this_should_be_an_error" >$TMPDIR/this_should_be_an_error.fish
$fish -c "set -g fish_function_path $(string escape $TMPDIR); this_should_be_an_error" $fish -c "set -g fish_function_path $(string escape $TMPDIR); this_should_be_an_error"

6
tests/checks/vars_as_commands.fish
View File

@ -32,17 +32,17 @@ $CMD3 && echo $PWD
echo 'if $status; echo foo; end' | $fish --no-config echo 'if $status; echo foo; end' | $fish --no-config
#CHECKERR: fish: $status is not valid as a command. See `help conditions` #CHECKERR: fish: $status is not valid as a command. See `help conditions`
#CHECKERR: if $status; echo foo; end #CHECKERR: if $status; echo foo; end
#CHECKERR: ^ #CHECKERR: ^~~~~~^
echo 'not $status' | $fish --no-config echo 'not $status' | $fish --no-config
#CHECKERR: fish: $status is not valid as a command. See `help conditions` #CHECKERR: fish: $status is not valid as a command. See `help conditions`
#CHECKERR: not $status #CHECKERR: not $status
#CHECKERR: ^ #CHECKERR: ^~~~~~^
# Script doesn't run at all. # Script doesn't run at all.
echo 'echo foo; and $status' | $fish --no-config echo 'echo foo; and $status' | $fish --no-config
#CHECKERR: fish: $status is not valid as a command. See `help conditions` #CHECKERR: fish: $status is not valid as a command. See `help conditions`
#CHECKERR: echo foo; and $status #CHECKERR: echo foo; and $status
#CHECKERR: ^ #CHECKERR: ^~~~~~^
echo 'set -l status_cmd true; if $status_cmd; echo Heck yes this is true; end' | $fish --no-config echo 'set -l status_cmd true; if $status_cmd; echo Heck yes this is true; end' | $fish --no-config
#CHECK: Heck yes this is true #CHECK: Heck yes this is true