Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-29 05:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use maybe_t in read_unquoted_escape

Browse source
This commit is contained in:
ridiculousfish 2019-09-14 12:54:38 -07:00
parent 7ea3255eef
commit fa1dab040b
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/common.cpp
View file

@ -1289,9 +1289,9 @@ maybe_t<size_t> read_unquoted_escape(const wchar_t *input, wcstring *result, boo
bool unescape_special) { bool unescape_special) {
assert(input[0] == L'\\' && "Not an escape"); assert(input[0] == L'\\' && "Not an escape");
// Here's the character we'll ultimately append, or NOT_A_WCHAR for none. Note that L'\0' is a // Here's the character we'll ultimately append, or none. Note that L'\0' is a
// valid thing to append. // valid thing to append.
wint_t result_char_or_none = NOT_A_WCHAR; maybe_t<wchar_t> result_char_or_none = none();
bool errored = false; bool errored = false;
size_t in_pos = 1; // in_pos always tracks the next character to read (and therefore the number size_t in_pos = 1; // in_pos always tracks the next character to read (and therefore the number
@ -1434,7 +1434,7 @@ maybe_t<size_t> read_unquoted_escape(const wchar_t *input, wcstring *result, boo
} }
// If a backslash is followed by an actual newline, swallow them both. // If a backslash is followed by an actual newline, swallow them both.
case L'\n': { case L'\n': {
result_char_or_none = NOT_A_WCHAR; result_char_or_none = none();
break; break;
} }
default: { default: {
@ -1444,11 +1444,8 @@ maybe_t<size_t> read_unquoted_escape(const wchar_t *input, wcstring *result, boo
} }
} }
if (!errored && result_char_or_none != NOT_A_WCHAR) { if (!errored && result_char_or_none.has_value()) {
wchar_t result_char = static_cast<wchar_t>(result_char_or_none); result->push_back(*result_char_or_none);
// If result_char is not NOT_A_WCHAR, it must be a valid wchar.
assert((wint_t)result_char == result_char_or_none);
result->push_back(result_char);
} }
if (errored) return none(); if (errored) return none();