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

Improve documentation and error reporting for elseif.

Browse Source
This commit is contained in:
ridiculousfish
2012-09-01 02:14:13 -07:00
parent cc1395797e
commit de5223db66
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
parser.cpp
View File

@@ -146,7 +146,7 @@ The fish parser. Contains functions for parsing and evaluating code.
/**
Error when using else builtin outside of if block
*/
#define INVALID_ELSE_ERR_MSG _( L"'else' builtin not inside of if block" )
#define INVALID_ELSE_OR_ELSEIF_ERR_MSG _( L"'%ls' builtin not inside of if block" )
/**
Error when using end builtin outside of block
@@ -3293,9 +3293,9 @@ int parser_t::test( const wchar_t * buff,
}
/*
Test that else is only used directly in an if-block
Test that else and elseif are only used directly in an if-block
*/
if( command == L"else" )
if( command == L"else" || command == L"elseif" )
{
if( !count || block_type[count-1]!=IF )
{
@@ -3304,7 +3304,8 @@ int parser_t::test( const wchar_t * buff,
{
error( SYNTAX_ERROR,
tok_get_pos( &tok ),
INVALID_ELSE_ERR_MSG );
INVALID_ELSE_OR_ELSEIF_ERR_MSG,
command.c_str());
print_errors( *out, prefix );
}