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

Pass the character index, not the character, to parse_util_expand_variable_error

Browse source 
Fixes #2067
This commit is contained in:
ridiculousfish 2015-05-15 17:10:29 -07:00
parent cec1dc2095
commit 534fd1a59e
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
expand.cpp
View file

@ -1034,7 +1034,7 @@ static int expand_variables(parser_t &parser, const wcstring &instr, std::vector
{ {
if (errors) if (errors)
{ {
parse_util_expand_variable_error(instr, 0 /* global_token_pos */, c, errors); parse_util_expand_variable_error(instr, 0 /* global_token_pos */, i, errors);
} }
is_ok = false; is_ok = false;

3
tests/expansion.err
View file

@ -28,3 +28,6 @@ fish: echo ()[1]
Invalid index value Invalid index value
fish: echo ()[d] fish: echo ()[d]
^ ^
$) is not a valid variable in fish.
fish: echo $$paren
^

4
tests/expansion.in
View file

@ -81,6 +81,10 @@ echo $foo[d]
echo ()[1] echo ()[1]
echo ()[d] echo ()[d]
echo "Catch your breath"
set paren ')'
echo $$paren
# Test tilde expansion # Test tilde expansion
# On OS X, /tmp is symlinked to /private/tmp # On OS X, /tmp is symlinked to /private/tmp
# $PWD is our best bet for resolving it # $PWD is our best bet for resolving it

1
tests/expansion.out
View file

@ -40,3 +40,4 @@
0 0
1 1
0 0
Catch your breath