Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-13 00:17:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

parse_execution: Use an exhaustive match instead of an assert

Browse source 
This could also be "cancel", which we didn't check and instead
asserted out.
This commit is contained in:
Fabian Boehm 2024-04-27 08:13:41 +02:00
parent fb99edae92
commit 1503be4287
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/parse_execution.rs
View file

@ -538,14 +538,16 @@ impl<'a> ParseExecutionContext {
Some(&mut errors), Some(&mut errors),
false, false,
); );
if expand_err == ExpandResultCode::error { match expand_err.result {
ExpandResultCode::error => {
// Issue #5812 - the expansions were done on the command token, // Issue #5812 - the expansions were done on the command token,
// excluding prefixes such as " " or "if ". // excluding prefixes such as " " or "if ".
// This means that the error positions are relative to the beginning // This means that the error positions are relative to the beginning
// of the token; we need to make them relative to the original source. // of the token; we need to make them relative to the original source.
parse_error_offset_source_start(&mut errors, pos_of_command_token); parse_error_offset_source_start(&mut errors, pos_of_command_token);
return self.report_errors(ctx, STATUS_ILLEGAL_CMD.unwrap(), &errors); return self.report_errors(ctx, STATUS_ILLEGAL_CMD.unwrap(), &errors);
} else if expand_err == ExpandResultCode::wildcard_no_match { }
ExpandResultCode::wildcard_no_match => {
return report_error!( return report_error!(
self, self,
ctx, ctx,
@ -555,7 +557,11 @@ impl<'a> ParseExecutionContext {
&self.node_source(statement) &self.node_source(statement)
); );
} }
assert!(expand_err == ExpandResultCode::ok); ExpandResultCode::cancel => {
return EndExecutionReason::cancelled;
}
ExpandResultCode::ok => {}
}
// Complain if the resulting expansion was empty, or expanded to an empty string. // Complain if the resulting expansion was empty, or expanded to an empty string.
// For no-exec it's okay, as we can't really perform the expansion. // For no-exec it's okay, as we can't really perform the expansion.