Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Highlight invalid use of variable expansion operator

Browse source 
darcs-hash:20060601230438-ac50b-165ec1515e0e02674a992a1f0309a567aa6828de.gz
This commit is contained in:
axel 2006-06-02 09:04:38 +10:00
parent 8986e05b94
commit 67f216fa55
4 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common.c
View file

@ -408,6 +408,11 @@ wchar_t *wcsvarname( wchar_t *str )
return 0;
}
int wcsvarchr( wchar_t chr )
{
return ( (iswalnum(chr)) || (chr == L'_' ));
}
/**
The glibc version of wcswidth seems to hang on some strings. fish uses this replacement.

8
common.h
View file

@ -151,6 +151,14 @@ wchar_t *wcsdupcat2( const wchar_t *a, ... );
wchar_t *wcsvarname( wchar_t *str );
/**
Test if the given string is valid in a variable name
\return 1 if this is a valid name, 0 otherwise
*/
int wcsvarchr( wchar_t chr );
/**
A wcswidth workalike. Fish uses this since the regular wcswidth seems flaky.

15
highlight.c
View file

@ -219,9 +219,17 @@ static void highlight_param( const wchar_t * buff,
break;
}
case L'$':
{
wchar_t n = buff[in_pos+1];
color[in_pos] = (n==L'$'||wcsvarchr(n))? HIGHLIGHT_OPERATOR:HIGHLIGHT_ERROR;
color[in_pos+1] = HIGHLIGHT_NORMAL;
break;
}
case L'*':
case L'?':
case L'$':
case L'(':
case L')':
{
@ -349,8 +357,9 @@ static void highlight_param( const wchar_t * buff,
case '$':
{
color[in_pos] = HIGHLIGHT_OPERATOR;
color[in_pos+1] = HIGHLIGHT_QUOTE;
wchar_t n = buff[in_pos+1];
color[in_pos] = (n==L'$'||wcsvarchr(n))? HIGHLIGHT_OPERATOR:HIGHLIGHT_ERROR;
color[in_pos+1] = HIGHLIGHT_QUOTE;
break;
}

9
parser.c
View file

@ -2684,10 +2684,11 @@ static int parser_test_argument( const wchar_t *arg, int babble, int offset )
default:
{
if( !iswalnum(*(pos+1)) &&
*(pos+1)!=L'_' &&
*(pos+1)!=VARIABLE_EXPAND &&
*(pos+1)!=VARIABLE_EXPAND_SINGLE )
wchar_t n = *(pos+1);
if( n != VARIABLE_EXPAND &&
n != VARIABLE_EXPAND_SINGLE &&
!wcsvarchr(n) )
{
err=1;
if( babble )