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

Allow nested square brackets again

Browse Source 
Code like echo $list[$var[1]] was producing an error because of
nested square brackets. Allow these brackets again.

Fixes #5362
This commit is contained in:
ridiculousfish
2018-11-22 17:52:07 -08:00
parent 60fa9da3a7
commit d6a5792ce2
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tokenizer.cpp
View File

@@ -205,17 +205,8 @@ tok_t tokenizer_t::read_string() {
expecting.pop_back();
} else if (c == L'[') {
if (this->buff != buff_start) {
if ((mode & tok_modes::array_brackets) == tok_modes::array_brackets) {
// Nested brackets should not overwrite the existing slice_offset
// mqudsi: TOK_ILLEGAL_SLICE is the right error here, but the shell
// prints an error message with the caret pointing at token_start,
// not err_loc, making the TOK_ILLEGAL_SLICE message misleading.
// return call_error(TOK_ILLEGAL_SLICE, buff_start, this->buff);
return this->call_error(tokenizer_error_t::unterminated_slice, this->start,
this->buff);
}
slice_offset = this->buff - this->start;
mode |= tok_modes::array_brackets;
slice_offset = this->buff - this->start;
} else {
// This is actually allowed so the test operator `[` can be used as the head of a
// command