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

Minor tweaks

Browse source 
darcs-hash:20051213182803-ac50b-859b5bd4274e24dfd462cdf4585f0a05b751f737.gz
This commit is contained in:
axel 2005-12-14 04:28:03 +10:00
parent 8bf0a14bd5
commit 86d7e8bb8e
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc_src/doc.hdr
View file

@ -990,8 +990,6 @@ g++, javac, java, gcj, lpr, doxygen, whois, find)
- Check keybinding commands for output - if non has happened, don't repaint to reduce flicker - Check keybinding commands for output - if non has happened, don't repaint to reduce flicker
- The jobs builtin should be able to give information on a specific job, such as the pids of the processes in the job - The jobs builtin should be able to give information on a specific job, such as the pids of the processes in the job
- Syntax highlighting should mark cd to non-existing directories as an error - Syntax highlighting should mark cd to non-existing directories as an error
- the code for printing the prompt should know about the most common escape sequences
- redo the jobs command
- wait shellscript - wait shellscript
\subsection todo-possible Possible features \subsection todo-possible Possible features

22
parser.c
View file

@ -103,6 +103,21 @@ The fish parser. Contains functions for parsing code.
*/ */
#define WILDCARD_ERR_MSG L"Warning: No match for wildcard %ls" #define WILDCARD_ERR_MSG L"Warning: No match for wildcard %ls"
/**
Error when using case builtin outside of switch block
*/
#define INVALID_CASE_ERR_MSG L"'case' builtin not inside of switch block"
/**
Error when using loop control builtins (break or continue) outside of loop
*/
#define INVALID_LOOP_ERR_MSG L"Loop control command while not inside of loop"
/**
Error when using else builtin outside of if block
*/
#define INVALID_ELSE_ERR_MSG L"'else' builtin not inside of if block"
/** /**
Error message for Posix-style assignment Error message for Posix-style assignment
*/ */
@ -2288,7 +2303,7 @@ int parser_test( wchar_t * buff,
{ {
error( SYNTAX_ERROR, error( SYNTAX_ERROR,
tok_get_pos( &tok ), tok_get_pos( &tok ),
L"'case' builtin not inside of switch block" ); INVALID_CASE_ERR_MSG );
print_errors(); print_errors();
} }
@ -2321,7 +2336,7 @@ int parser_test( wchar_t * buff,
{ {
error( SYNTAX_ERROR, error( SYNTAX_ERROR,
tok_get_pos( &tok ), tok_get_pos( &tok ),
L"Loop control command while not inside of loop" ); INVALID_LOOP_ERR_MSG );
print_errors(); print_errors();
} }
} }
@ -2339,7 +2354,8 @@ int parser_test( wchar_t * buff,
{ {
error( SYNTAX_ERROR, error( SYNTAX_ERROR,
tok_get_pos( &tok ), tok_get_pos( &tok ),
L"'else' builtin not inside of if block" ); INVALID_ELSE_ERR_MSG );
print_errors(); print_errors();
} }
} }