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

Add variable expand ranges

Browse Source 
echo $PATH[-1..1] #now works

Add tests for ranges
This commit is contained in:
maxfl
2012-07-08 09:19:11 +08:00
parent c0e996acf8
commit 5f05756e65
6 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
expand.cpp
View File

@@ -727,7 +727,7 @@ void expand_variable_error( parser_t &parser, const wchar_t *token, int token_po
/**
Parse an array slicing specification
*/
static int parse_slice( const wchar_t *in, wchar_t **end_ptr, std::vector<long> &idx, int size=-1 )
static int parse_slice( const wchar_t *in, wchar_t **end_ptr, std::vector<long> &idx, int size )
{
wchar_t *end;
@@ -757,6 +757,7 @@ static int parse_slice( const wchar_t *in, wchar_t **end_ptr, std::vector<long>
}
// debug( 0, L"Push idx %d", tmp );
long i1 = tmp>-1 ? tmp : size+tmp+1;
pos = end-in;
if ( in[pos]==L'.' && in[pos+1]==L'.' ){
pos+=2;
@@ -767,23 +768,19 @@ static int parse_slice( const wchar_t *in, wchar_t **end_ptr, std::vector<long>
}
pos = end-in;
if ( size>-1 ) {
// debug( 0, L"Push range idx %d %d", tmp, tmp1 );
long i1 = tmp>-1 ? tmp : size+tmp+1;
long i2 = tmp1>-1 ? tmp1 : size+tmp1+1;
// debug( 0, L"Push range idx %d %d", i1, i2 );
short direction = i2<i1 ? -1 : 1 ;
for (long jjj = i1; jjj*direction <= i2*direction; jjj+=direction) {
// debug(0, L"Expand range [subst]: %i\n", jjj);
idx.push_back( jjj );
}
// debug( 0, L"Push range %d %d", tmp, tmp1 );
long i2 = tmp1>-1 ? tmp1 : size+tmp1+1;
// debug( 0, L"Push range idx %d %d", i1, i2 );
short direction = i2<i1 ? -1 : 1 ;
for (long jjj = i1; jjj*direction <= i2*direction; jjj+=direction) {
// debug(0, L"Expand range [subst]: %i\n", jjj);
idx.push_back( jjj );
}
continue;
}
// debug( 0, L"Push idx %d", tmp );
idx.push_back(tmp);
// idx.push_back(tmp2);
idx.push_back( i1 );
}
if( end_ptr )
@@ -875,25 +872,26 @@ static int expand_variables_internal( parser_t &parser, wchar_t * const in, std:
int all_vars=1;
wcstring_list_t var_item_list;
if( in[stop_pos] == L'[' )
{
wchar_t *slice_end;
all_vars=0;
if( parse_slice( in + stop_pos, &slice_end, var_idx_list ) )
{
parser.error( SYNTAX_ERROR,
-1,
L"Invalid index value" );
is_ok = 0;
}
stop_pos = (slice_end-in);
}
if( is_ok )
{
tokenize_variable_array( var_val.c_str(), var_item_list );
if( in[stop_pos] == L'[' )
{
wchar_t *slice_end;
all_vars=0;
if( parse_slice( in + stop_pos, &slice_end, var_idx_list, var_item_list.size() ) )
{
parser.error( SYNTAX_ERROR,
-1,
L"Invalid index value" );
is_ok = 0;
break;
}
stop_pos = (slice_end-in);
}
if( !all_vars )
{
wcstring_list_t string_values(var_idx_list.size());
@@ -901,11 +899,6 @@ static int expand_variables_internal( parser_t &parser, wchar_t * const in, std:
for( size_t j=0; j<var_idx_list.size(); j++)
{
long tmp = var_idx_list.at(j);
if( tmp < 0 )
{
tmp = ((long)var_item_list.size())+tmp+1;
}
/*
Check that we are within array
bounds. If not, truncate the list to
@@ -1224,10 +1217,11 @@ static int expand_cmdsubst( parser_t &parser, const wcstring &input, std::vector
long idx = slice_idx.at(i);
if( idx < 1 || (size_t)idx > sub_res.size() )
{
parser.error( SYNTAX_ERROR, -1, L"Invalid index value" );
parser.error( SYNTAX_ERROR,
-1,
ARRAY_BOUNDS_ERR );
return 0;
}
idx = idx-1;
sub_res2.push_back(sub_res.at(idx));