Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-31 23:28:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

More clean up of parse_util_detect_errors_in_argument

Browse source
This commit is contained in:
ridiculousfish 2020-07-14 15:51:12 -07:00
parent 3532a955a6
commit 352062219d
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/parse_util.cpp
View file

@ -917,35 +917,30 @@ parser_test_error_bits_t parse_util_detect_errors_in_argument(const ast::argumen
if (!source_range.has_value()) return 0; if (!source_range.has_value()) return 0;
size_t source_start = source_range->start; size_t source_start = source_range->start;
int err = 0; parser_test_error_bits_t err = 0;
int do_loop = 1;
wcstring working_copy = arg_src;
while (do_loop) {
size_t paren_begin = 0;
size_t paren_end = 0;
size_t cursor = 0; size_t cursor = 0;
wcstring subst; wcstring subst;
switch (parse_util_locate_cmdsubst_range(working_copy, &cursor, &subst, &paren_begin, bool do_loop = true;
&paren_end, false)) { while (do_loop) {
size_t paren_begin = 0;
size_t paren_end = 0;
switch (parse_util_locate_cmdsubst_range(arg_src, &cursor, &subst, &paren_begin, &paren_end,
false)) {
case -1: { case -1: {
err = 1; 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, L"Mismatched parenthesis");
} }
return err; return err;
} }
case 0: { case 0: {
do_loop = 0; do_loop = false;
break; break;
} }
case 1: { case 1: {
// Replace the command substitution with just INTERNAL_SEPARATOR.
assert(paren_begin < paren_end && "Parens out of order?"); assert(paren_begin < paren_end && "Parens out of order?");
working_copy.replace(paren_begin, paren_end - paren_begin + 1, 1,
INTERNAL_SEPARATOR);
parse_error_list_t subst_errors; parse_error_list_t subst_errors;
err |= parse_util_detect_errors(subst, &subst_errors); err |= parse_util_detect_errors(subst, &subst_errors);
@ -962,9 +957,9 @@ parser_test_error_bits_t parse_util_detect_errors_in_argument(const ast::argumen
// after we've replaced with internal separators, we can't distinguish between // after we've replaced with internal separators, we can't distinguish between
// "" and (), and also we no longer have the source of the command substitution. // "" and (), and also we no longer have the source of the command substitution.
// As an optimization, this is only necessary if the last character is a $. // As an optimization, this is only necessary if the last character is a $.
if (paren_begin > 0 && working_copy.at(paren_begin - 1) == L'$') { if (paren_begin > 0 && arg_src.at(paren_begin - 1) == L'$') {
err |= detect_dollar_cmdsub_errors( err |= detect_dollar_cmdsub_errors(
source_start, working_copy.substr(0, paren_begin), subst, out_errors); source_start, arg_src.substr(0, paren_begin), subst, out_errors);
} }
} }
break; break;
@ -976,10 +971,9 @@ parser_test_error_bits_t parse_util_detect_errors_in_argument(const ast::argumen
} }
wcstring unesc; wcstring unesc;
if (!unescape_string(working_copy, &unesc, UNESCAPE_SPECIAL)) { if (!unescape_string(arg_src, &unesc, UNESCAPE_SPECIAL)) {
if (out_errors) { if (out_errors) {
append_syntax_error(out_errors, source_start, L"Invalid token '%ls'", append_syntax_error(out_errors, source_start, L"Invalid token '%ls'", arg_src.c_str());
working_copy.c_str());
} }
return 1; return 1;
} }