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

Improve and expand is_whitespace helper functions

Browse source
This commit is contained in:
Mahmoud Al-Qudsi 2018-03-12 08:06:50 -05:00
parent 2951fadc6b
commit 0b96b516d5
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/common.cpp
View file

@ -75,11 +75,20 @@ static volatile bool termsize_valid = false;
static char *wcs2str_internal(const wchar_t *in, char *out); static char *wcs2str_internal(const wchar_t *in, char *out);
static void debug_shared(const wchar_t msg_level, const wcstring &msg); static void debug_shared(const wchar_t msg_level, const wcstring &msg);
const wchar_t *whitespace = L" \t\r\n\v"; const wcstring whitespace = L" \t\r\n\v";
const char *whitespace_narrow = " \t\r\n\v"; const char *whitespace_narrow = " \t\r\n\v";
bool is_whitespace(const wchar_t input) {
for (auto c : whitespace) {
if (c == input) {
return true;
}
}
return false;
}
bool is_whitespace(const wcstring &input) { bool is_whitespace(const wcstring &input) {
return input.find_first_not_of(whitespace); return input.find_first_not_of(whitespace) == wcstring::npos;
} }
bool has_working_tty_timestamps = true; bool has_working_tty_timestamps = true;

3
src/common.h
View file

@ -206,9 +206,10 @@ extern const wchar_t *program_name;
extern bool has_working_tty_timestamps; extern bool has_working_tty_timestamps;
/// A list of all whitespace characters /// A list of all whitespace characters
extern const wchar_t *whitespace; extern const wcstring whitespace;
extern const char *whitespace_narrow; extern const char *whitespace_narrow;
bool is_whitespace(const wchar_t input);
bool is_whitespace(const wcstring &input); bool is_whitespace(const wcstring &input);
inline bool is_whitespace(const wchar_t *input) { return is_whitespace(wcstring(input)); } inline bool is_whitespace(const wchar_t *input) { return is_whitespace(wcstring(input)); }