h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-08 10:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Initial work towars improved error reporting. Tests currently fail.

Browse Source
This commit is contained in:
ridiculousfish
2013-12-08 21:54:06 -08:00
parent 5769fa6aed
commit 7a3f5afee7
9 changed files with 483 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
parser.cpp
View File

@@ -86,11 +86,6 @@ The fish parser. Contains functions for parsing and evaluating code.
*/
#define BLOCK_END_ERR_MSG _( L"Could not locate end of block. The 'end' command is missing, misspelled or a ';' is missing.")
/**
Error message on reaching maximum number of block calls
*/
#define BLOCK_ERR_MSG _( L"Maximum number of nested blocks reached.")
/**
Error message when a non-string token is found when expecting a command name
*/
@@ -2572,9 +2567,9 @@ void parser_t::eval_job(tokenizer_t *tok)
}
int parser_t::eval(const wcstring &cmdStr, const io_chain_t &io, enum block_type_t block_type)
int parser_t::eval(const wcstring &cmd_str, const io_chain_t &io, enum block_type_t block_type)
{
const wchar_t * const cmd = cmdStr.c_str();
const wchar_t * const cmd = cmd_str.c_str();
size_t forbid_count;
int code;
block_t *start_current_block = current_block;
@@ -2597,13 +2592,6 @@ int parser_t::eval(const wcstring &cmdStr, const io_chain_t &io, enum block_type
debug(4, L"eval: %ls", cmd);
if (!cmd)
{
debug(1,
EVAL_NULL_ERR_MSG);
bugreport();
return 1;
}
if ((block_type != TOP) &&
(block_type != SUBST))