diff --git a/internal/cgen/base/token-public.h b/internal/cgen/base/token-public.h index f707ab6c..f4d65510 100644 --- a/internal/cgen/base/token-public.h +++ b/internal/cgen/base/token-public.h @@ -39,49 +39,53 @@ wuffs_base__make_token(uint64_t repr) { // -------- -#define WUFFS_BASE__TOKEN__LENGTH__MAX_INCL 0xFFFF - -#define WUFFS_BASE__TOKEN__VALUE__SHIFT 17 -#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT 17 -#define WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT 42 -#define WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT 17 -#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT 38 -#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT 17 -#define WUFFS_BASE__TOKEN__CONTINUED__SHIFT 16 -#define WUFFS_BASE__TOKEN__LENGTH__SHIFT 0 - -#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__NUM_BITS 46 +// clang-format off // -------- -#define WUFFS_BASE__TOKEN__VBC__FILLER 0 -#define WUFFS_BASE__TOKEN__VBC__STRUCTURE 1 -#define WUFFS_BASE__TOKEN__VBC__STRING 2 -#define WUFFS_BASE__TOKEN__VBC__UNICODE_CODE_POINT 3 -#define WUFFS_BASE__TOKEN__VBC__LITERAL 4 -#define WUFFS_BASE__TOKEN__VBC__NUMBER 5 -#define WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_SIGNED 6 +#define WUFFS_BASE__TOKEN__LENGTH__MAX_INCL 0xFFFF + +#define WUFFS_BASE__TOKEN__VALUE__SHIFT 17 +#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT 17 +#define WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT 42 +#define WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT 17 +#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT 38 +#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT 17 +#define WUFFS_BASE__TOKEN__CONTINUED__SHIFT 16 +#define WUFFS_BASE__TOKEN__LENGTH__SHIFT 0 + +#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__NUM_BITS 46 + +// -------- + +#define WUFFS_BASE__TOKEN__VBC__FILLER 0 +#define WUFFS_BASE__TOKEN__VBC__STRUCTURE 1 +#define WUFFS_BASE__TOKEN__VBC__STRING 2 +#define WUFFS_BASE__TOKEN__VBC__UNICODE_CODE_POINT 3 +#define WUFFS_BASE__TOKEN__VBC__LITERAL 4 +#define WUFFS_BASE__TOKEN__VBC__NUMBER 5 +#define WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_SIGNED 6 #define WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_UNSIGNED 7 // -------- -#define WUFFS_BASE__TOKEN__VBD__FILLER__PUNCTUATION 0x00001 +#define WUFFS_BASE__TOKEN__VBD__FILLER__PUNCTUATION 0x00001 #define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_BLOCK 0x00002 -#define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_LINE 0x00004 +#define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_LINE 0x00004 // COMMENT_ANY is a bit-wise or of COMMENT_BLOCK AND COMMENT_LINE. -#define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_ANY 0x00006 +#define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_ANY 0x00006 // -------- -#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__PUSH 0x00001 -#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__POP 0x00002 +#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__PUSH 0x00001 +#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__POP 0x00002 #define WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_NONE 0x00010 #define WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_LIST 0x00020 #define WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_DICT 0x00040 -#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_NONE 0x01000 -#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_LIST 0x02000 -#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_DICT 0x04000 +#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_NONE 0x01000 +#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_LIST 0x02000 +#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_DICT 0x04000 // -------- @@ -101,11 +105,11 @@ wuffs_base__make_token(uint64_t repr) { // // The lack of any particular bit is conservative: it is valid for all-ASCII // strings, in a single- or multi-token chain, to have none of these bits set. -#define WUFFS_BASE__TOKEN__VBD__STRING__DEFINITELY_UTF_8 0x00001 -#define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_MUST_BE_UTF_8 0x00002 +#define WUFFS_BASE__TOKEN__VBD__STRING__DEFINITELY_UTF_8 0x00001 +#define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_MUST_BE_UTF_8 0x00002 #define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_SHOULD_BE_UTF_8 0x00004 -#define WUFFS_BASE__TOKEN__VBD__STRING__DEFINITELY_ASCII 0x00010 -#define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_MUST_BE_ASCII 0x00020 +#define WUFFS_BASE__TOKEN__VBD__STRING__DEFINITELY_ASCII 0x00010 +#define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_MUST_BE_ASCII 0x00020 #define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_SHOULD_BE_ASCII 0x00040 // CONVERT_D_DST_S_SRC means that multiples of S source bytes (possibly padded) @@ -120,22 +124,22 @@ wuffs_base__make_token(uint64_t repr) { // When src is the empty string, multiple conversion algorithms are applicable // (so these bits are not necessarily mutually exclusive), all producing the // same empty dst string. -#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP 0x00100 -#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_1_SRC_COPY 0x00200 +#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP 0x00100 +#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_1_SRC_COPY 0x00200 #define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_2_SRC_HEXADECIMAL 0x00400 #define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_4_SRC_BACKSLASH_X 0x00800 #define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_3_DST_4_SRC_BASE_64_STD 0x01000 #define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_3_DST_4_SRC_BASE_64_URL 0x02000 -#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_4_DST_5_SRC_ASCII_85 0x04000 +#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_4_DST_5_SRC_ASCII_85 0x04000 #define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_5_DST_8_SRC_BASE_32_HEX 0x08000 #define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_5_DST_8_SRC_BASE_32_STD 0x10000 // -------- #define WUFFS_BASE__TOKEN__VBD__LITERAL__UNDEFINED 0x00001 -#define WUFFS_BASE__TOKEN__VBD__LITERAL__NULL 0x00002 -#define WUFFS_BASE__TOKEN__VBD__LITERAL__FALSE 0x00004 -#define WUFFS_BASE__TOKEN__VBD__LITERAL__TRUE 0x00008 +#define WUFFS_BASE__TOKEN__VBD__LITERAL__NULL 0x00002 +#define WUFFS_BASE__TOKEN__VBD__LITERAL__FALSE 0x00004 +#define WUFFS_BASE__TOKEN__VBD__LITERAL__TRUE 0x00008 // -------- @@ -148,8 +152,8 @@ wuffs_base__make_token(uint64_t repr) { // For a source string of "+123" or "-0x9A", only the first two are valid. // // For a source string of "123.", only the first one is valid. -#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_FLOATING_POINT 0x00001 -#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_INTEGER_SIGNED 0x00002 +#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_FLOATING_POINT 0x00001 +#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_INTEGER_SIGNED 0x00002 #define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_INTEGER_UNSIGNED 0x00004 #define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_NEG_INF 0x00010 @@ -161,11 +165,15 @@ wuffs_base__make_token(uint64_t repr) { // "300", which are big-endian, little-endian or text. For binary formats, the // token length (after adjusting for FORMAT_IGNORE_ETC) discriminates // e.g. u16 little-endian vs u32 little-endian. -#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_BIG_ENDIAN 0x00100 +#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_BIG_ENDIAN 0x00100 #define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_LITTLE_ENDIAN 0x00200 -#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_TEXT 0x00400 +#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_TEXT 0x00400 -#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_IGNORE_FIRST_BYTE 0x01000 +#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_IGNORE_FIRST_BYTE 0x01000 + +// -------- + +// clang-format on // -------- diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index f40fa2c9..1a197f73 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -3350,49 +3350,53 @@ wuffs_base__make_token(uint64_t repr) { // -------- -#define WUFFS_BASE__TOKEN__LENGTH__MAX_INCL 0xFFFF - -#define WUFFS_BASE__TOKEN__VALUE__SHIFT 17 -#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT 17 -#define WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT 42 -#define WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT 17 -#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT 38 -#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT 17 -#define WUFFS_BASE__TOKEN__CONTINUED__SHIFT 16 -#define WUFFS_BASE__TOKEN__LENGTH__SHIFT 0 - -#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__NUM_BITS 46 +// clang-format off // -------- -#define WUFFS_BASE__TOKEN__VBC__FILLER 0 -#define WUFFS_BASE__TOKEN__VBC__STRUCTURE 1 -#define WUFFS_BASE__TOKEN__VBC__STRING 2 -#define WUFFS_BASE__TOKEN__VBC__UNICODE_CODE_POINT 3 -#define WUFFS_BASE__TOKEN__VBC__LITERAL 4 -#define WUFFS_BASE__TOKEN__VBC__NUMBER 5 -#define WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_SIGNED 6 +#define WUFFS_BASE__TOKEN__LENGTH__MAX_INCL 0xFFFF + +#define WUFFS_BASE__TOKEN__VALUE__SHIFT 17 +#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT 17 +#define WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT 42 +#define WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT 17 +#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT 38 +#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT 17 +#define WUFFS_BASE__TOKEN__CONTINUED__SHIFT 16 +#define WUFFS_BASE__TOKEN__LENGTH__SHIFT 0 + +#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__NUM_BITS 46 + +// -------- + +#define WUFFS_BASE__TOKEN__VBC__FILLER 0 +#define WUFFS_BASE__TOKEN__VBC__STRUCTURE 1 +#define WUFFS_BASE__TOKEN__VBC__STRING 2 +#define WUFFS_BASE__TOKEN__VBC__UNICODE_CODE_POINT 3 +#define WUFFS_BASE__TOKEN__VBC__LITERAL 4 +#define WUFFS_BASE__TOKEN__VBC__NUMBER 5 +#define WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_SIGNED 6 #define WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_UNSIGNED 7 // -------- -#define WUFFS_BASE__TOKEN__VBD__FILLER__PUNCTUATION 0x00001 +#define WUFFS_BASE__TOKEN__VBD__FILLER__PUNCTUATION 0x00001 #define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_BLOCK 0x00002 -#define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_LINE 0x00004 +#define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_LINE 0x00004 // COMMENT_ANY is a bit-wise or of COMMENT_BLOCK AND COMMENT_LINE. -#define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_ANY 0x00006 +#define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_ANY 0x00006 // -------- -#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__PUSH 0x00001 -#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__POP 0x00002 +#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__PUSH 0x00001 +#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__POP 0x00002 #define WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_NONE 0x00010 #define WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_LIST 0x00020 #define WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_DICT 0x00040 -#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_NONE 0x01000 -#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_LIST 0x02000 -#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_DICT 0x04000 +#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_NONE 0x01000 +#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_LIST 0x02000 +#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_DICT 0x04000 // -------- @@ -3412,11 +3416,11 @@ wuffs_base__make_token(uint64_t repr) { // // The lack of any particular bit is conservative: it is valid for all-ASCII // strings, in a single- or multi-token chain, to have none of these bits set. -#define WUFFS_BASE__TOKEN__VBD__STRING__DEFINITELY_UTF_8 0x00001 -#define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_MUST_BE_UTF_8 0x00002 +#define WUFFS_BASE__TOKEN__VBD__STRING__DEFINITELY_UTF_8 0x00001 +#define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_MUST_BE_UTF_8 0x00002 #define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_SHOULD_BE_UTF_8 0x00004 -#define WUFFS_BASE__TOKEN__VBD__STRING__DEFINITELY_ASCII 0x00010 -#define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_MUST_BE_ASCII 0x00020 +#define WUFFS_BASE__TOKEN__VBD__STRING__DEFINITELY_ASCII 0x00010 +#define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_MUST_BE_ASCII 0x00020 #define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_SHOULD_BE_ASCII 0x00040 // CONVERT_D_DST_S_SRC means that multiples of S source bytes (possibly padded) @@ -3431,22 +3435,22 @@ wuffs_base__make_token(uint64_t repr) { // When src is the empty string, multiple conversion algorithms are applicable // (so these bits are not necessarily mutually exclusive), all producing the // same empty dst string. -#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP 0x00100 -#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_1_SRC_COPY 0x00200 +#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP 0x00100 +#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_1_SRC_COPY 0x00200 #define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_2_SRC_HEXADECIMAL 0x00400 #define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_4_SRC_BACKSLASH_X 0x00800 #define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_3_DST_4_SRC_BASE_64_STD 0x01000 #define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_3_DST_4_SRC_BASE_64_URL 0x02000 -#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_4_DST_5_SRC_ASCII_85 0x04000 +#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_4_DST_5_SRC_ASCII_85 0x04000 #define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_5_DST_8_SRC_BASE_32_HEX 0x08000 #define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_5_DST_8_SRC_BASE_32_STD 0x10000 // -------- #define WUFFS_BASE__TOKEN__VBD__LITERAL__UNDEFINED 0x00001 -#define WUFFS_BASE__TOKEN__VBD__LITERAL__NULL 0x00002 -#define WUFFS_BASE__TOKEN__VBD__LITERAL__FALSE 0x00004 -#define WUFFS_BASE__TOKEN__VBD__LITERAL__TRUE 0x00008 +#define WUFFS_BASE__TOKEN__VBD__LITERAL__NULL 0x00002 +#define WUFFS_BASE__TOKEN__VBD__LITERAL__FALSE 0x00004 +#define WUFFS_BASE__TOKEN__VBD__LITERAL__TRUE 0x00008 // -------- @@ -3459,8 +3463,8 @@ wuffs_base__make_token(uint64_t repr) { // For a source string of "+123" or "-0x9A", only the first two are valid. // // For a source string of "123.", only the first one is valid. -#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_FLOATING_POINT 0x00001 -#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_INTEGER_SIGNED 0x00002 +#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_FLOATING_POINT 0x00001 +#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_INTEGER_SIGNED 0x00002 #define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_INTEGER_UNSIGNED 0x00004 #define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_NEG_INF 0x00010 @@ -3472,11 +3476,15 @@ wuffs_base__make_token(uint64_t repr) { // "300", which are big-endian, little-endian or text. For binary formats, the // token length (after adjusting for FORMAT_IGNORE_ETC) discriminates // e.g. u16 little-endian vs u32 little-endian. -#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_BIG_ENDIAN 0x00100 +#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_BIG_ENDIAN 0x00100 #define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_LITTLE_ENDIAN 0x00200 -#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_TEXT 0x00400 +#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_TEXT 0x00400 -#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_IGNORE_FIRST_BYTE 0x01000 +#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_IGNORE_FIRST_BYTE 0x01000 + +// -------- + +// clang-format on // --------