Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +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 20:26:10 -07:00
parent d441de33e5
commit 520f810bf9
1 changed files with 82 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/parse_execution.cpp
View file

@ -372,7 +372,10 @@ parse_execution_result_t parse_execution_context_t::run_function_statement(
wcstring_list_t argument_list; wcstring_list_t argument_list;
parse_execution_result_t result = this->determine_arguments(header, &argument_list, failglob); parse_execution_result_t result = this->determine_arguments(header, &argument_list, failglob);
if (result == parse_execution_success) { if (result != parse_execution_success) {
return result;
}
// The function definition extends from the end of the header to the function end. It's not // The function definition extends from the end of the header to the function end. It's not
// just the range of the contents because that loses comments - see issue #1710. // just the range of the contents because that loses comments - see issue #1710.
assert(block_end_command.has_source()); assert(block_end_command.has_source());
@ -403,7 +406,7 @@ parse_execution_result_t parse_execution_context_t::run_function_statement(
this->report_error(header, L"%ls", error_str.c_str()); this->report_error(header, L"%ls", error_str.c_str());
result = parse_execution_errored; result = parse_execution_errored;
} }
}
return result; return result;
} }
@ -546,7 +549,10 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
switch_values_expanded.size()); switch_values_expanded.size());
} }
if (result == parse_execution_success) { if (result != parse_execution_success) {
return result;
}
const wcstring &switch_value_expanded = switch_values_expanded.at(0).completion; const wcstring &switch_value_expanded = switch_values_expanded.at(0).completion;
switch_block_t *sb = new switch_block_t(); switch_block_t *sb = new switch_block_t();
@ -604,8 +610,6 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
} }
parser->pop_block(sb); parser->pop_block(sb);
}
return result; return result;
} }