Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes for the tokenizer to correctly return error values on invalid input

Browse source 
darcs-hash:20060715124005-ac50b-a3f06a51b53573a07db44f9ce6796f253b2596e9.gz
This commit is contained in:
axel 2006-07-15 22:40:05 +10:00
parent af0bd61fb5
commit c96382152c
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tokenizer.c
View file

@ -118,10 +118,12 @@ void tok_init( tokenizer *tok, const wchar_t *b, int flags )
{
CHECK( tok, );
CHECK( b, );
memset( tok, 0, sizeof( tokenizer) );
CHECK( b, );
tok->accept_unfinished = flags & TOK_ACCEPT_UNFINISHED;
tok->show_comments = flags & TOK_SHOW_COMMENTS;
tok->has_next=1;
@ -162,7 +164,8 @@ void tok_destroy( tokenizer *tok )
int tok_last_type( tokenizer *tok )
{
CHECK( tok, 0 );
CHECK( tok, TOK_ERROR );
CHECK( tok->buff, TOK_ERROR );
return tok->last_type;
}
@ -176,6 +179,12 @@ wchar_t *tok_last( tokenizer *tok )
int tok_has_next( tokenizer *tok )
{
/*
Return 1 on broken tokenizer
*/
CHECK( tok, 1 );
CHECK( tok->buff, 1 );
/* fwprintf( stderr, L"has_next is %ls \n", tok->has_next?L"true":L"false" );*/
return tok->has_next;
}
@ -496,6 +505,7 @@ void tok_next( tokenizer *tok )
{
CHECK( tok, );
CHECK( tok->buff, );
if( tok_last_type( tok ) == TOK_ERROR )
{