Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 13:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

lint: Use early exit/continue

Browse source
This commit is contained in:
Kurtis Rader 2016-10-30 21:05:27 -07:00
parent 520f810bf9
commit 2c38978115
1 changed files with 88 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

164
src/parse_util.cpp
View file

@ -197,26 +197,28 @@ static int parse_util_locate_brackets_range(const wcstring &str, size_t *inout_c
int ret = parse_util_locate_brackets_of_type(valid_range_start, &bracket_range_begin, int ret = parse_util_locate_brackets_of_type(valid_range_start, &bracket_range_begin,
&bracket_range_end, accept_incomplete, open_type, &bracket_range_end, accept_incomplete, open_type,
close_type); close_type);
if (ret > 0) { if (ret <= 0) {
// The command substitutions must not be NULL and must be in the valid pointer range, and return ret;
// the end must be bigger than the beginning.
assert(bracket_range_begin != NULL && bracket_range_begin >= valid_range_start &&
bracket_range_begin <= valid_range_end);
assert(bracket_range_end != NULL && bracket_range_end > bracket_range_begin &&
bracket_range_end >= valid_range_start && bracket_range_end <= valid_range_end);
// Assign the substring to the out_contents.
const wchar_t *interior_begin = bracket_range_begin + 1;
out_contents->assign(interior_begin, bracket_range_end - interior_begin);
// Return the start and end.
*out_start = bracket_range_begin - buff;
*out_end = bracket_range_end - buff;
// Update the inout_cursor_offset. Note this may cause it to exceed str.size(), though
// overflow is not likely.
*inout_cursor_offset = 1 + *out_end;
} }
// The command substitutions must not be NULL and must be in the valid pointer range, and
// the end must be bigger than the beginning.
assert(bracket_range_begin != NULL && bracket_range_begin >= valid_range_start &&
bracket_range_begin <= valid_range_end);
assert(bracket_range_end != NULL && bracket_range_end > bracket_range_begin &&
bracket_range_end >= valid_range_start && bracket_range_end <= valid_range_end);
// Assign the substring to the out_contents.
const wchar_t *interior_begin = bracket_range_begin + 1;
out_contents->assign(interior_begin, bracket_range_end - interior_begin);
// Return the start and end.
*out_start = bracket_range_begin - buff;
*out_end = bracket_range_end - buff;
// Update the inout_cursor_offset. Note this may cause it to exceed str.size(), though
// overflow is not likely.
*inout_cursor_offset = 1 + *out_end;
return ret; return ret;
} }
@ -921,24 +923,28 @@ static parser_test_error_bits_t detect_dollar_cmdsub_errors(size_t arg_src_offse
parse_error_list_t *out_errors) { parse_error_list_t *out_errors) {
parser_test_error_bits_t result_bits = 0; parser_test_error_bits_t result_bits = 0;
wcstring unescaped_arg_src; wcstring unescaped_arg_src;
if (unescape_string(arg_src, &unescaped_arg_src, UNESCAPE_SPECIAL) &&
!unescaped_arg_src.empty()) { if (!unescape_string(arg_src, &unescaped_arg_src, UNESCAPE_SPECIAL) ||
wchar_t last = unescaped_arg_src.at(unescaped_arg_src.size() - 1); unescaped_arg_src.empty()) {
if (last == VARIABLE_EXPAND) { return result_bits;
result_bits |= PARSER_TEST_ERROR; }
if (out_errors != NULL) {
wcstring subcommand_first_token = tok_first(cmdsubst_src); wchar_t last = unescaped_arg_src.at(unescaped_arg_src.size() - 1);
if (subcommand_first_token.empty()) { if (last == VARIABLE_EXPAND) {
// e.g. $(). Report somthing. result_bits |= PARSER_TEST_ERROR;
subcommand_first_token = L"..."; if (out_errors != NULL) {
} wcstring subcommand_first_token = tok_first(cmdsubst_src);
append_syntax_error( if (subcommand_first_token.empty()) {
out_errors, // e.g. $(). Report somthing.
arg_src_offset + arg_src.size() - 1, // global position of the dollar subcommand_first_token = L"...";
ERROR_BAD_VAR_SUBCOMMAND1, truncate_string(subcommand_first_token).c_str());
} }
append_syntax_error(
out_errors,
arg_src_offset + arg_src.size() - 1, // global position of the dollar
ERROR_BAD_VAR_SUBCOMMAND1, truncate_string(subcommand_first_token).c_str());
} }
} }
return result_bits; return result_bits;
} }
@ -1023,23 +1029,24 @@ parser_test_error_bits_t parse_util_detect_errors_in_argument(const parse_node_t
// Check for invalid variable expansions. // Check for invalid variable expansions.
const size_t unesc_size = unesc.size(); const size_t unesc_size = unesc.size();
for (size_t idx = 0; idx < unesc_size; idx++) { for (size_t idx = 0; idx < unesc_size; idx++) {
if (unesc.at(idx) == VARIABLE_EXPAND || unesc.at(idx) == VARIABLE_EXPAND_SINGLE) { if (unesc.at(idx) != VARIABLE_EXPAND && unesc.at(idx) != VARIABLE_EXPAND_SINGLE) {
wchar_t next_char = idx + 1 < unesc_size ? unesc.at(idx + 1) : L'\0'; continue;
}
if (next_char != VARIABLE_EXPAND && next_char != VARIABLE_EXPAND_SINGLE && wchar_t next_char = idx + 1 < unesc_size ? unesc.at(idx + 1) : L'\0';
!wcsvarchr(next_char)) { if (next_char != VARIABLE_EXPAND && next_char != VARIABLE_EXPAND_SINGLE &&
err = 1; !wcsvarchr(next_char)) {
if (out_errors) { err = 1;
// We have something like $$$^.... Back up until we reach the first $. if (out_errors) {
size_t first_dollar = idx; // We have something like $$$^.... Back up until we reach the first $.
while (first_dollar > 0 && size_t first_dollar = idx;
(unesc.at(first_dollar - 1) == VARIABLE_EXPAND || while (first_dollar > 0 &&
unesc.at(first_dollar - 1) == VARIABLE_EXPAND_SINGLE)) { (unesc.at(first_dollar - 1) == VARIABLE_EXPAND ||
first_dollar--; unesc.at(first_dollar - 1) == VARIABLE_EXPAND_SINGLE)) {
} first_dollar--;
parse_util_expand_variable_error(unesc, node.source_start, first_dollar,
out_errors);
} }
parse_util_expand_variable_error(unesc, node.source_start, first_dollar,
out_errors);
} }
} }
} }
@ -1147,33 +1154,38 @@ parser_test_error_bits_t parse_util_detect_errors(const wcstring &buff_src,
assert(next_job_list != NULL); assert(next_job_list != NULL);
const parse_node_t *next_job = const parse_node_t *next_job =
node_tree.next_node_in_node_list(*next_job_list, symbol_job, NULL); node_tree.next_node_in_node_list(*next_job_list, symbol_job, NULL);
if (next_job != NULL) { if (next_job == NULL) {
const parse_node_t *next_statement = break;
node_tree.get_child(*next_job, 0, symbol_statement); }
if (next_statement != NULL) {
const parse_node_t *spec_statement = const parse_node_t *next_statement =
node_tree.get_child(*next_statement, 0); node_tree.get_child(*next_job, 0, symbol_statement);
if (spec_statement && if (next_statement == NULL) {
spec_statement->type == symbol_boolean_statement) { break;
switch (parse_node_tree_t::statement_boolean_type( }
*spec_statement)) {
// These are not allowed. const parse_node_t *spec_statement =
case parse_bool_and: node_tree.get_child(*next_statement, 0);
errored = append_syntax_error( if (!spec_statement ||
&parse_errors, spec_statement->source_start, spec_statement->type != symbol_boolean_statement) {
BOOL_AFTER_BACKGROUND_ERROR_MSG, L"and"); break;
break; }
case parse_bool_or:
errored = append_syntax_error( switch (parse_node_tree_t::statement_boolean_type(*spec_statement)) {
&parse_errors, spec_statement->source_start, case parse_bool_and: { // this is not allowed
BOOL_AFTER_BACKGROUND_ERROR_MSG, L"or"); errored = append_syntax_error(
break; &parse_errors, spec_statement->source_start,
case parse_bool_not: BOOL_AFTER_BACKGROUND_ERROR_MSG, L"and");
// This one is OK. break;
break; }
} case parse_bool_or: { // this is not allowed
} errored = append_syntax_error(
} &parse_errors, spec_statement->source_start,
BOOL_AFTER_BACKGROUND_ERROR_MSG, L"or");
break;
}
// All others are OK.
default: { break; }
} }
break; break;
} }