Tweak error messages in tokenizer a bit

darcs-hash:20061117145905-ac50b-ee735bf04d2dcbabc272c4f12cb64a8af51b83bf.gz
This commit is contained in:
axel 2006-11-18 00:59:05 +10:00
parent 54244fd33d
commit 1e8fe508f0

View File

@ -28,22 +28,17 @@ segments.
/** /**
Error string for unexpected end of string Error string for unexpected end of string
*/ */
#define EOL_ERROR _( L"Unexpected end of token" ) #define QUOTE_ERROR _( L"Unexpected end of string, quotes are not balanced" )
/**
Error string for unexpected end of string
*/
#define QUOTE_ERROR _( L"Unterminated quote" )
/** /**
Error string for mismatched parenthesis Error string for mismatched parenthesis
*/ */
#define PARAN_ERROR _( L"Parenthesis mismatch" ) #define PARAN_ERROR _( L"Unexpected end of string, parenthesis do not match" )
/** /**
Error string for invalid redirections Error string for invalid redirections
*/ */
#define REDIRECT_ERROR _( L"Invalid redirection" ) #define REDIRECT_ERROR _( L"Invalid input/output redirection" )
/** /**
Error string for when trying to pipe from fd 0 Error string for when trying to pipe from fd 0
@ -251,7 +246,7 @@ static void read_string( tokenizer *tok )
tok->buff++; tok->buff++;
if( *tok->buff == L'\0' ) if( *tok->buff == L'\0' )
{ {
tok_error( tok, TOK_UNTERMINATED_ESCAPE, EOL_ERROR ); tok_error( tok, TOK_UNTERMINATED_ESCAPE, QUOTE_ERROR );
return; return;
} }
else if( *tok->buff == L'\n' && mode == 0) else if( *tok->buff == L'\n' && mode == 0)