h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-12 23:01:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix for https://github.com/fish-shell/fish-shell/issues/168

Browse Source 
Make ^ only act as a redirect at the beginning of a token
This commit is contained in:
ridiculousfish
2012-07-10 20:30:54 -07:00
parent 11dd904b6d
commit 4ee1cc3b37
4 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tokenizer.cpp
View File

@@ -185,12 +185,34 @@ int tok_has_next( tokenizer *tok )
}
/**
Tests if this character can be a part of a string
Tests if this character can be a part of a string. The redirect ^ is allowed unless it's the first character.
*/
static int is_string_char( wchar_t c )
static bool is_string_char( wchar_t c, bool is_first )
{
return !( !c || wcschr( SEP, c ) );
switch (c)
{
/* Unconditional separators */
case L'\0':
case L' ':
case L'\n':
case L'|':
case L'\t':
case L';':
case L'#':
case L'\r':
case L'<':
case L'>':
case L'&':
return false;
/* Conditional separator */
case L'^':
return ! is_first;
default:
return true;
}
}
/**
@@ -216,7 +238,8 @@ static void read_string( tokenizer *tok )
int paran_count=0;
start = tok->buff;
bool is_first = true;
while( 1 )
{
@@ -308,7 +331,7 @@ static void read_string( tokenizer *tok )
default:
{
if( !is_string_char(*(tok->buff)) )
if( !is_string_char(*(tok->buff), is_first) )
{
do_loop=0;
}
@@ -383,6 +406,7 @@ static void read_string( tokenizer *tok )
break;
tok->buff++;
is_first = false;
}
if( (!tok->accept_unfinished) && (mode!=0) )
@@ -609,13 +633,13 @@ void tok_next( tokenizer *tok )
break;
case L'>':
read_redirect( tok, 1 );
read_redirect( tok, 1 );
return;
case L'<':
read_redirect( tok, 0 );
read_redirect( tok, 0 );
return;
case L'^':
read_redirect( tok, 2 );
read_redirect( tok, 2 );
return;
default: