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

Suppress wildcard errors in functions

Browse source 
Wildcard errors are only supposed to reported when encountered during
interactive use. The old parser also suppressed them if `is_block` was
true. This was lost in the new parser. However, this also suppresses
errors generated from `begin; code_here; end` and other block
constructs.

Instead, check the parser block stack when we hit an error, and suppress
the error if there are any function calls / events / source invocations.
These all indicate that the code being executed came from somewhere
other than the commandline.
This commit is contained in:
Kevin Ballard 2014-10-13 17:49:26 -07:00
parent 0372cdbe7e
commit 07e4170418
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
parse_execution.cpp
View file

@ -750,10 +750,33 @@ parse_execution_result_t parse_execution_context_t::report_errors(const parse_er
parse_execution_result_t parse_execution_context_t::report_unmatched_wildcard_error(const parse_node_t &unmatched_wildcard)
{
proc_set_last_status(STATUS_UNMATCHED_WILDCARD);
/* For reasons I cannot explain, unmatched wildcards are only reported in interactive use. */
// unmatched wildcards are only reported in interactive use because scripts have legitimate reasons
// to want to use wildcards without knowing whether they expand to anything.
if (get_is_interactive())
{
report_error(unmatched_wildcard, WILDCARD_ERR_MSG, get_source(unmatched_wildcard).c_str());
// Check if we're running code that was typed at the commandline.
// We can't just use `is_block` or the eval level, because `begin; echo *.unmatched; end` would not report
// the error even though it's run interactively.
// But any non-interactive use must have at least one function / event handler / source on the stack.
bool interactive = true;
for (size_t i = 0, count = parser->block_count(); i < count; ++i)
{
switch (parser->block_at_index(i)->type())
{
case FUNCTION_CALL:
case FUNCTION_CALL_NO_SHADOW:
case EVENT:
case SOURCE:
interactive = false;
break;
default:
break;
}
}
if (interactive)
{
report_error(unmatched_wildcard, WILDCARD_ERR_MSG, get_source(unmatched_wildcard).c_str());
}
}
return parse_execution_errored;
}