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

Make tok_last_type return an enum token_type instead of int

Browse Source
This commit is contained in:
ridiculousfish
2013-09-30 13:57:36 -07:00
parent 6c70ed79ae
commit cbe615224d
7 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
parser.cpp
View File

@@ -154,7 +154,7 @@ The fish parser. Contains functions for parsing and evaluating code.
/**
Error message for Posix-style assignment
*/
#define COMMAND_ASSIGN_ERR_MSG _( L"Unknown command '%ls'. Did you mean 'set %ls %ls'? For information on assigning values to variables, see the help section on the set command by typing 'help set'.")
#define COMMAND_ASSIGN_ERR_MSG _( L"Unknown command '%ls'. Did you mean 'set %ls %ls'? See the help section on the set command by typing 'help set'.")
/**
Error for invalid redirection token
@@ -2012,8 +2012,9 @@ int parser_t::parse_job(process_t *p,
if (! has_command && ! use_implicit_cd)
{
int tmp;
const wchar_t *cmd = args.at(0).completion.c_str();
fprintf(stderr, "arg count: %lu\n", args.size());
/*
We couldn't find the specified command.
@@ -2095,7 +2096,7 @@ int parser_t::parse_job(process_t *p,
event_fire_generic(L"fish_command_not_found", &event_args);
}
tmp = current_tokenizer_pos;
int tmp = current_tokenizer_pos;
current_tokenizer_pos = tok_get_pos(tok);
fwprintf(stderr, L"%ls", parser_t::current_line());