Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 21:33:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to latest widecharwidth

Browse source 
Fixes a Cygwin incompatibility. Fixes #6549
This commit is contained in:
ridiculousfish 2020-01-30 20:50:08 -08:00
parent 2c4e15e267
commit 73106198c8
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/widecharwidth/widechar_width.h
View file

@ -1,5 +1,5 @@
/** /**
* widechar_width.h, generated on 2019-05-14. * widechar_width.h, generated on 2020-01-30.
* See https://github.com/ridiculousfish/widecharwidth/ * See https://github.com/ridiculousfish/widecharwidth/
* *
* SHA1 file hashes: * SHA1 file hashes:
@ -30,8 +30,8 @@ enum {
/* An inclusive range of characters. */ /* An inclusive range of characters. */
struct widechar_range { struct widechar_range {
wchar_t lo; uint32_t lo;
wchar_t hi; uint32_t hi;
}; };
/* Simple ASCII characters - used a lot, so we check them first. */ /* Simple ASCII characters - used a lot, so we check them first. */
@ -506,14 +506,14 @@ static const struct widechar_range widechar_widened_table[] = {
}; };
template<typename Collection> template<typename Collection>
bool widechar_in_table(const Collection &arr, wchar_t c) { bool widechar_in_table(const Collection &arr, uint32_t c) {
auto where = std::lower_bound(std::begin(arr), std::end(arr), c, auto where = std::lower_bound(std::begin(arr), std::end(arr), c,
[](widechar_range p, wchar_t c) { return p.hi < c; }); [](widechar_range p, uint32_t c) { return p.hi < c; });
return where != std::end(arr) && where->lo <= c; return where != std::end(arr) && where->lo <= c;
} }
/* Return the width of character c, or a special negative value. */ /* Return the width of character c, or a special negative value. */
int widechar_wcwidth(wchar_t c) { int widechar_wcwidth(uint32_t c) {
if (widechar_in_table(widechar_ascii_table, c)) if (widechar_in_table(widechar_ascii_table, c))
return 1; return 1;
if (widechar_in_table(widechar_private_table, c)) if (widechar_in_table(widechar_private_table, c))