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

Defeat "enumeral mismatch" g++ warnings through typecasting

Browse source
This commit is contained in:
ridiculousfish 2017-01-26 17:18:38 -08:00
parent 07c9f0de9d
commit e78cefd759
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/common.cpp
View file

@ -39,7 +39,7 @@
#include "wildcard.h" #include "wildcard.h"
#include "wutil.h" // IWYU pragma: keep #include "wutil.h" // IWYU pragma: keep
#define NOT_A_WCHAR (static_cast<wint_t>(WEOF)) constexpr wint_t NOT_A_WCHAR = static_cast<wint_t>(WEOF);
struct termios shell_modes; struct termios shell_modes;
@ -950,8 +950,7 @@ wcstring escape_string(const wcstring &in, escape_flags_t flags) {
/// Helper to return the last character in a string, or NOT_A_WCHAR. /// Helper to return the last character in a string, or NOT_A_WCHAR.
static wint_t string_last_char(const wcstring &str) { static wint_t string_last_char(const wcstring &str) {
size_t len = str.size(); return str.empty() ? NOT_A_WCHAR : str.back();
return len == 0 ? NOT_A_WCHAR : str.at(len - 1);
} }
/// Given a null terminated string starting with a backslash, read the escape as if it is unquoted, /// Given a null terminated string starting with a backslash, read the escape as if it is unquoted,
@ -1229,12 +1228,12 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
} }
case L'\'': { case L'\'': {
mode = mode_single_quotes; mode = mode_single_quotes;
to_append_or_none = unescape_special ? INTERNAL_SEPARATOR : NOT_A_WCHAR; to_append_or_none = unescape_special ? wint_t(INTERNAL_SEPARATOR) : NOT_A_WCHAR;
break; break;
} }
case L'\"': { case L'\"': {
mode = mode_double_quotes; mode = mode_double_quotes;
to_append_or_none = unescape_special ? INTERNAL_SEPARATOR : NOT_A_WCHAR; to_append_or_none = unescape_special ? wint_t(INTERNAL_SEPARATOR) : NOT_A_WCHAR;
break; break;
} }
default: { break; } default: { break; }
@ -1268,14 +1267,14 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
} }
} }
} else if (c == L'\'') { } else if (c == L'\'') {
to_append_or_none = unescape_special ? INTERNAL_SEPARATOR : NOT_A_WCHAR; to_append_or_none = unescape_special ? wint_t(INTERNAL_SEPARATOR) : NOT_A_WCHAR;
mode = mode_unquoted; mode = mode_unquoted;
} }
} else if (mode == mode_double_quotes) { } else if (mode == mode_double_quotes) {
switch (c) { switch (c) {
case L'"': { case L'"': {
mode = mode_unquoted; mode = mode_unquoted;
to_append_or_none = unescape_special ? INTERNAL_SEPARATOR : NOT_A_WCHAR; to_append_or_none = unescape_special ? wint_t(INTERNAL_SEPARATOR) : NOT_A_WCHAR;
break; break;
} }
case '\\': { case '\\': {