github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-27 03:13:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct escaping behavior in new tokenizer code

Browse Source
This commit is contained in:
Mahmoud Al-Qudsi 2018-03-11 17:10:16 -05:00
parent f508a1f274
commit df89d71237
1 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tokenizer.cpp
View File

@ -154,6 +154,10 @@ tok_t tokenizer_t::read_string() {
tok_mode mode_begin = mode; tok_mode mode_begin = mode;
#endif #endif
if (c == L'\0') {
break;
}
// Make sure this character isn't being escaped before anything else // Make sure this character isn't being escaped before anything else
if ((mode & tok_mode::char_escape) == tok_mode::char_escape) { if ((mode & tok_mode::char_escape) == tok_mode::char_escape) {
mode &= ~(tok_mode::char_escape); mode &= ~(tok_mode::char_escape);
@ -163,10 +167,6 @@ tok_t tokenizer_t::read_string() {
// Early exit optimization in case the character is just a letter, // Early exit optimization in case the character is just a letter,
// which has no special meaning to the tokenizer, i.e. the same mode continues. // which has no special meaning to the tokenizer, i.e. the same mode continues.
} }
// This check has to be after the char_escape check above
else if (c == L'\0') {
break;
}
// Now proceed with the evaluation of the token, first checking to see if the token // Now proceed with the evaluation of the token, first checking to see if the token
// has been explicitly ignored (escaped). // has been explicitly ignored (escaped).
@ -244,7 +244,7 @@ tok_t tokenizer_t::read_string() {
tok_t error; tok_t error;
if ((mode & tok_mode::char_escape) == tok_mode::char_escape) { if ((mode & tok_mode::char_escape) == tok_mode::char_escape) {
error = this->call_error(TOK_UNTERMINATED_ESCAPE, buff_start, error = this->call_error(TOK_UNTERMINATED_ESCAPE, buff_start,
this->buff); this->buff - 1);
} }
else if ((mode & tok_mode::array_brackets) == tok_mode::array_brackets) { else if ((mode & tok_mode::array_brackets) == tok_mode::array_brackets) {
error = this->call_error(TOK_UNTERMINATED_SLICE, buff_start, error = this->call_error(TOK_UNTERMINATED_SLICE, buff_start,