github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-18 09:32:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweaks to a few error messages (Thanks to Philip Ganchev)

Browse Source 
darcs-hash:20060422100630-ac50b-18cef1e493321e8ad0cf65982dc1748965d02630.gz
This commit is contained in:
axel 2006-04-22 20:06:30 +10:00
parent 508de57459
commit fd2644ce49
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
parser.c
View File

@ -101,12 +101,12 @@ The fish parser. Contains functions for parsing code.
/** /**
Error message when a non-string token is found when expecting a command name Error message when a non-string token is found when expecting a command name
*/ */
#define CMD_OR_ERR_MSG _( L"Expected a command name, got token of type '%ls'. Did you mean 'COMMAND; or COMMAND'? For more information on the 'or' builtin command, see the help section for 'or' by typing 'help or'.") #define CMD_OR_ERR_MSG _( L"Expected a command name, got token of type '%ls'. Did you mean 'COMMAND; or COMMAND'? See the help section for the 'or' builtin command by typing 'help or'.")
/** /**
Error message when a non-string token is found when expecting a command name Error message when a non-string token is found when expecting a command name
*/ */
#define CMD_AND_ERR_MSG _( L"Expected a command name, got token of type '%ls'. Did you mean 'COMMAND; and COMMAND'? For more information on the 'and' builtin command, see the help section for 'and' by typing 'help and'.") #define CMD_AND_ERR_MSG _( L"Expected a command name, got token of type '%ls'. Did you mean 'COMMAND; and COMMAND'? See the help section for the 'and' builtin command by typing 'help and'.")
/** /**
Error message when encountering an illegal command name Error message when encountering an illegal command name
@ -2009,7 +2009,7 @@ static int parse_job( process_t *p,
if( val ) if( val )
{ {
debug( 0, debug( 0,
_(L"Variables may not be used as commands. Define a function like 'function %ls; %ls $argv; end' instead. For more information, see the help section for the function command by typing 'help function'." ), _(L"Variables may not be used as commands. Instead, define a function like 'function %ls; %ls $argv; end'. See the help section for the function command by typing 'help function'." ),
cmd+1, cmd+1,
val, val,
cmd ); cmd );
@ -2017,14 +2017,14 @@ static int parse_job( process_t *p,
else else
{ {
debug( 0, debug( 0,
_(L"Variables may not be used as commands. Define a function instead. For more information, see the help section for the function command by typing 'help function'." ), _(L"Variables may not be used as commands. Instead, define a function. See the help section for the function command by typing 'help function'." ),
cmd ); cmd );
} }
} }
else if(wcschr( cmd, L'$' )) else if(wcschr( cmd, L'$' ))
{ {
debug( 0, debug( 0,
_(L"Commands may not contain variables. Use the eval builtin instead, like 'eval %ls'. For more information, see the help section for the eval command by typing 'help eval'." ), _(L"Commands may not contain variables. Use the eval builtin instead, like 'eval %ls'. See the help section for the eval command by typing 'help eval'." ),
cmd, cmd,
cmd ); cmd );
} }