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

Correct certain tokenizer error reporting for unclosed subshells

Browse Source 
There was some confusion about the different pointers and offsets
in tokenizer_t::call_error.

Fixes #6281
This commit is contained in:
ridiculousfish
2019-11-08 16:53:13 -08:00
parent eb2386f3e3
commit ef8b5e4fa0
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/tokenizer.cpp
View File

@@ -184,31 +184,30 @@ tok_t tokenizer_t::read_string() {
} else if (c == L')') {
if (expecting.size() > 0 && expecting.back() == L'}') {
return this->call_error(tokenizer_error_t::expected_bclose_found_pclose,
this->start, this->token_cursor, 1);
this->token_cursor, this->token_cursor, 1);
}
switch (paran_offsets.size()) {
case 0:
return this->call_error(tokenizer_error_t::closing_unopened_subshell,
this->start, this->token_cursor, 1);
case 1:
mode &= ~(tok_modes::subshell);
default:
paran_offsets.pop_back();
if (paran_offsets.empty()) {
return this->call_error(tokenizer_error_t::closing_unopened_subshell,
this->token_cursor, this->token_cursor, 1);
}
paran_offsets.pop_back();
if (paran_offsets.empty()) {
mode &= ~(tok_modes::subshell);
}
expecting.pop_back();
} else if (c == L'}') {
if (expecting.size() > 0 && expecting.back() == L')') {
return this->call_error(tokenizer_error_t::expected_pclose_found_bclose,
this->start, this->token_cursor, 1);
this->token_cursor, this->token_cursor, 1);
}
switch (brace_offsets.size()) {
case 0:
return this->call_error(tokenizer_error_t::closing_unopened_brace,
this->token_cursor, this->start + wcslen(this->start));
case 1:
mode &= ~(tok_modes::curly_braces);
default:
brace_offsets.pop_back();
if (brace_offsets.empty()) {
return this->call_error(tokenizer_error_t::closing_unopened_brace,
this->token_cursor,
this->token_cursor + wcslen(this->token_cursor));
}
brace_offsets.pop_back();
if (brace_offsets.empty()) {
mode &= ~(tok_modes::curly_braces);
}
expecting.pop_back();
} else if (c == L'[') {