h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-26 11:01:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate parser_t::show_errors

Browse Source 
Errors are now unconditionally shown
This commit is contained in:
ridiculousfish
2016-02-27 18:37:59 -08:00
parent cbd3fa6b01
commit d628fe0dea
5 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/parse_execution.cpp
View File

@@ -720,28 +720,25 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(const pa
/* Reports an error. Always returns parse_execution_errored, so you can assign the result to an 'errored' variable */
parse_execution_result_t parse_execution_context_t::report_error(const parse_node_t &node, const wchar_t *fmt, ...) const
{
if (parser->show_errors)
{
/* Create an error */
parse_error_list_t error_list = parse_error_list_t(1);
parse_error_t *error = &error_list.at(0);
error->source_start = node.source_start;
error->source_length = node.source_length;
error->code = parse_error_syntax; //hackish
/* Create an error */
parse_error_list_t error_list = parse_error_list_t(1);
parse_error_t *error = &error_list.at(0);
error->source_start = node.source_start;
error->source_length = node.source_length;
error->code = parse_error_syntax; //hackish
va_list va;
va_start(va, fmt);
error->text = vformat_string(fmt, va);
va_end(va);
va_list va;
va_start(va, fmt);
error->text = vformat_string(fmt, va);
va_end(va);
this->report_errors(error_list);
}
this->report_errors(error_list);
return parse_execution_errored;
}
parse_execution_result_t parse_execution_context_t::report_errors(const parse_error_list_t &error_list) const
{
if (parser->show_errors && ! parser->cancellation_requested)
if (! parser->cancellation_requested)
{
if (error_list.empty())
{