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

src/builtin_test: Print backtrace on error

Browse source 
`test` is a common source of problems, and with the current system
they can be quite hard to find.

So we print a backtrace with line numbers and all.
This commit is contained in:
Fabian Homborg 2019-03-26 21:40:10 +01:00
parent d8ec4685ff
commit 785945c861
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/builtin_test.cpp
View file

@ -21,6 +21,7 @@
#include "builtin.h"
#include "common.h"
#include "io.h"
#include "parser.h"
#include "wutil.h" // IWYU pragma: keep
using std::unique_ptr;
@ -830,6 +831,7 @@ int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
argc--;
} else {
streams.err.append(L"[: the last argument must be ']'\n");
builtin_print_error_trailer(parser, streams.err, program_name);
return STATUS_INVALID_ARGS;
}
}
@ -848,14 +850,8 @@ int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
wcstring err;
unique_ptr<expression> expr = test_parser::parse_args(args, err, program_name);
if (!expr) {
#if 0
streams.err.append(L"Oops! test was given args:\n");
for (size_t i=0; i < argc; i++) {
streams.err.append_format(L"\t%ls\n", args.at(i).c_str());
}
streams.err.append_format(L"and returned parse error: %ls\n", err.c_str());
#endif
streams.err.append(err);
builtin_print_error_trailer(parser, streams.err, program_name);
return STATUS_CMD_ERROR;
}
@ -866,6 +862,9 @@ int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
for (size_t i = 0; i < eval_errors.size(); i++) {
streams.err.append_format(L"%ls\n", eval_errors.at(i).c_str());
}
// Add a backtrace but not the "see help" message
// because this isn't about passing the wrong options.
streams.err.append(parser.current_line());
}
return STATUS_INVALID_ARGS;
}