diff options
| author | Dave Hylands <dhylands@gmail.com> | 2015-05-19 16:41:07 -0700 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-05-20 09:31:22 +0100 |
| commit | afaa66b657e0edc4f73dd01258327a28e552f65d (patch) | |
| tree | a72693ef591ec0d722a4e66838748ded793ebfe9 /py | |
| parent | 3ad94d6072555955a796c8c72a526c4fdff86711 (diff) | |
| download | micropython-afaa66b657e0edc4f73dd01258327a28e552f65d.tar.gz micropython-afaa66b657e0edc4f73dd01258327a28e552f65d.zip | |
py: Minor improvement to unichar_isxdigit
This drops the size of unicode_isxdigit from 0x1e + 0x02 filler to
0x14 bytes (so net code reduction of 12 bytes) and will make
unicode_is_xdigit perform slightly faster.
Diffstat (limited to 'py')
| -rw-r--r-- | py/unicode.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/py/unicode.c b/py/unicode.c index 63e9601185..ccf2b554e3 100644 --- a/py/unicode.c +++ b/py/unicode.c @@ -35,14 +35,17 @@ #define FL_ALPHA (0x08) #define FL_UPPER (0x10) #define FL_LOWER (0x20) +#define FL_XDIGIT (0x40) // shorthand character attributes #define AT_PR (FL_PRINT) #define AT_SP (FL_SPACE | FL_PRINT) -#define AT_DI (FL_DIGIT | FL_PRINT) +#define AT_DI (FL_DIGIT | FL_PRINT | FL_XDIGIT) #define AT_AL (FL_ALPHA | FL_PRINT) #define AT_UP (FL_UPPER | FL_ALPHA | FL_PRINT) #define AT_LO (FL_LOWER | FL_ALPHA | FL_PRINT) +#define AT_UX (FL_UPPER | FL_ALPHA | FL_PRINT | FL_XDIGIT) +#define AT_LX (FL_LOWER | FL_ALPHA | FL_PRINT | FL_XDIGIT) // table of attributes for ascii characters STATIC const uint8_t attr[] = { @@ -54,11 +57,11 @@ STATIC const uint8_t attr[] = { AT_PR, AT_PR, AT_PR, AT_PR, AT_PR, AT_PR, AT_PR, AT_PR, AT_DI, AT_DI, AT_DI, AT_DI, AT_DI, AT_DI, AT_DI, AT_DI, AT_DI, AT_DI, AT_PR, AT_PR, AT_PR, AT_PR, AT_PR, AT_PR, - AT_PR, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, + AT_PR, AT_UX, AT_UX, AT_UX, AT_UX, AT_UX, AT_UX, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_UP, AT_PR, AT_PR, AT_PR, AT_PR, AT_PR, - AT_PR, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, + AT_PR, AT_LX, AT_LX, AT_LX, AT_LX, AT_LX, AT_LX, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_LO, AT_PR, AT_PR, AT_PR, AT_PR, 0 @@ -139,7 +142,7 @@ bool unichar_isdigit(unichar c) { } bool unichar_isxdigit(unichar c) { - return unichar_isdigit(c) || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'); + return c < 128 && (attr[c] & FL_XDIGIT) != 0; } /* |