diff options
Diffstat (limited to 'src/casefold.py')
| -rw-r--r-- | src/casefold.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/casefold.py b/src/casefold.py index 82d19853..951f3bf6 100644 --- a/src/casefold.py +++ b/src/casefold.py @@ -150,7 +150,7 @@ if __name__ == "__main__": print(r''' uint32_t utf8_tolower(uint32_t c) { - for (int i=0; i < sizeof casefold/sizeof *casefold; ++i) { + for (size_t i=0; i < sizeof casefold/sizeof *casefold; ++i) { if (c <= casefold[i].c1) { if (c < casefold[i].c0) return c; int d = casefold[i].m1 - casefold[i].c1; @@ -162,11 +162,11 @@ uint32_t utf8_tolower(uint32_t c) { } uint32_t utf8_toupper(uint32_t c) { - for (int i=0; i < sizeof cfold_low/sizeof *cfold_low; ++i) { + for (size_t i=0; i < sizeof cfold_low/sizeof *cfold_low; ++i) { struct CaseFold cfold = casefold[cfold_low[i]]; if (c <= cfold.m1) { int d = cfold.m1 - cfold.c1; - if (c < cfold.c0 + d) return c; + if (c < (uint32_t)(cfold.c0 + d)) return c; if (d == 1) return c - ((cfold.m1 & 1) == (c & 1)); return c - d; } @@ -185,7 +185,7 @@ bool utf8_islower(uint32_t c) { bool utf8_isspace(uint32_t c) { static uint16_t t[] = {0x20, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x85, 0xA0, 0x1680, 0x2028, 0x2029, 0x202F, 0x205F, 0x3000}; - for (int i=0; i<sizeof t/sizeof *t; ++i) + for (size_t i=0; i<sizeof t/sizeof *t; ++i) if (c == t[i]) return true; return (c >= 0x2000) & (c <= 0x200A); } @@ -198,7 +198,7 @@ bool utf8_isdigit(uint32_t c) { bool utf8_isxdigit(uint32_t c) { static uint16_t t[] = {0x30, 0x39, 0x41, 0x46, 0x61, 0x66, 0xFF10, 0xFF19, 0xFF21, 0xFF26, 0xFF41, 0xFF46}; - for (int i=1; i<sizeof t/sizeof *t; i += 2) + for (size_t i=1; i<sizeof t/sizeof *t; i += 2) if (c <= t[i]) return c >= t[i - 1]; return false; } @@ -218,7 +218,7 @@ bool utf8_isalpha(uint32_t c) { #ifdef TEST int main() { - for (int i=0; i < sizeof cfold_low/sizeof *cfold_low; ++i) + for (size_t i=0; i < sizeof cfold_low/sizeof *cfold_low; ++i) { char x[3][5]={0}; uint32_t a = casefold[i].c0; |