diff options
| author | Thomas Voss <mail@thomasvoss.com> | 2024-03-31 20:08:09 +0200 |
|---|---|---|
| committer | Thomas Voss <mail@thomasvoss.com> | 2024-03-31 20:08:09 +0200 |
| commit | 8e9c592f1af6d4e428fe65362cce36a39f5844f0 (patch) | |
| tree | 2b6628313c75989b415162b4eec35ba85653a832 /include | |
| parent | a61379f455b80236e251c56c32a16748f2d35af3 (diff) | |
Prefer constexpr, and rename U8_BYTE_*()
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbstring.h | 20 | ||||
| -rw-r--r-- | include/rune.h | 9 |
2 files changed, 15 insertions, 14 deletions
diff --git a/include/mbstring.h b/include/mbstring.h index 2b5ec01..0bf4685 100644 --- a/include/mbstring.h +++ b/include/mbstring.h @@ -13,19 +13,19 @@ #define U8_ARGSP(s) (&(s).p), (&(s).len) /* clang-format off */ -#define U8_BYTE_1(x) (((x) & 0x80) == 0x00) -#define U8_BYTE_2(x) (((x) & 0xE0) == 0xC0) -#define U8_BYTE_3(x) (((x) & 0xF0) == 0xE0) -#define U8_BYTE_4(x) (((x) & 0xF8) == 0xF0) -#define U8_BYTE_C(x) (((x) & 0xC0) == 0x80) +#define u8byte1(x) (((x) & 0x80) == 0x00) +#define u8byte2(x) (((x) & 0xE0) == 0xC0) +#define u8byte3(x) (((x) & 0xF0) == 0xE0) +#define u8byte4(x) (((x) & 0xF8) == 0xF0) +#define u8bytec(x) (((x) & 0xC0) == 0x80) /* clang-format on */ -#define U8_1B_MAX RUNE_C(0x00007FL) -#define U8_2B_MAX RUNE_C(0x0007FFL) -#define U8_3B_MAX RUNE_C(0x00FFFFL) -#define U8_4B_MAX RUNE_C(0x10FFFFL) +constexpr rune U8_1B_MAX = 0x00007F; +constexpr rune U8_2B_MAX = 0x0007FF; +constexpr rune U8_3B_MAX = 0x00FFFF; +constexpr rune U8_4B_MAX = 0x10FFFF; -#define U8_LEN_MAX 4 +constexpr int U8_LEN_MAX = 4; #define PRIsU8 ".*s" #define U8_PRI_ARGS(sv) ((int)(sv).len), ((sv).p) diff --git a/include/rune.h b/include/rune.h index fc9f927..db08de2 100644 --- a/include/rune.h +++ b/include/rune.h @@ -28,9 +28,10 @@ #define RUNE_C(x) UINT32_C(x) -#define ASCII_MAX RUNE_C(0x00007F) -#define LATIN1_MAX RUNE_C(0x0000FF) -#define RUNE_ERROR RUNE_C(0x00FFFD) -#define RUNE_MAX RUNE_C(0x10FFFF) +constexpr rune RUNE_ERROR = 0x00FFFD; + +constexpr rune ASCII_MAX = 0x00007F; +constexpr rune LATIN1_MAX = 0x0000FF; +constexpr rune RUNE_MAX = 0x10FFFF; #endif /* !MLIB_RUNE_H */ |