From 496e88b6c5c5011de8aa4ceed8dd9de66ca5f27f Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 9 Apr 2020 22:10:08 +1000 Subject: [PATCH] Remove wuffs_base__token__link_prev --- doc/note/tokens.md | 63 ++++---- example/jsonfindptrs/jsonfindptrs.cc | 2 +- example/jsonptr/jsonptr.cc | 10 +- fuzz/c/std/json_fuzzer.c | 6 +- internal/cgen/base/token-public.h | 38 ++--- internal/cgen/builtin.go | 2 +- internal/cgen/data.go | 8 +- lang/builtin/builtin.go | 4 +- release/c/wuffs-unsupported-snapshot.c | 136 ++++++++---------- script/print-json-token-debug-format.c | 36 +++-- std/json/decode_json.wuffs | 135 +++++++++-------- test/c/testlib/testlib.c | 6 +- .../data/australian-abc-local-stations.tokens | Bin 67792 -> 67792 bytes test/data/json-quirks.tokens | Bin 960 -> 960 bytes test/data/json-things.unformatted.tokens | Bin 480 -> 480 bytes 15 files changed, 206 insertions(+), 240 deletions(-) diff --git a/doc/note/tokens.md b/doc/note/tokens.md index 8a9bde02..5577f2da 100644 --- a/doc/note/tokens.md +++ b/doc/note/tokens.md @@ -36,25 +36,22 @@ string are treated differently when reconstructing the decoded string: A token is just a `uint64_t`. The broad divisions are: -- Bits 63 .. 18 (46 bits) is the value. -- Bits 17 .. 16 (2 bits) is `LP` and `LN` (`link_prev` and `link_next`). +- Bits 63 .. 17 (47 bits) is the value. +- Bits 16 .. 16 (1 bit) is the `continued` bit. - Bits 15 .. 0 (16 bits) is the length. -The `LP` and `LN` bits denote tokens that are part of a multi-token chain: - -- `LP` means that this token is not the first (there is a previous token). -- `LN` means that this token is not the last (there is a next token). - -A stand-alone token will have both link bits set to zero. +The `continued` bit is whether that the token chain for this token also +contains the next token. The final token in a token chain, including +stand-alone tokens, will have the `continued` bit set to zero. ``` -+-----+-------------+-------+-------------+-----+-----+-----------+ -| 1 | 21 | 3 | 21 | 1 | 1 | 16 | -+-----+-------------+-------+-------------+-----+-----+-----------+ -[..................value..................] LP LN length -[..1..|..........~value_extension.........] -[..0..|.value_major.|.....value_minor.....] -[..0..|......0......|..VBC..|.....VBD.....] ++-----+-------------+-------+---------------+-----+-----------+ +| 1 | 21 | 3 | 22 | 1 | 16 | ++-----+-------------+-------+---------------+-----+-----------+ +[...................value...................] con length +[..1..|...........~value_extension..........] +[..0..|.value_major.|......value_minor......] +[..0..|......0......|..VBC..|......VBD......] ``` The value bits can be sub-divided in multiple ways. First, the high bit: @@ -64,7 +61,7 @@ The value bits can be sub-divided in multiple ways. First, the high bit: ### Extended Tokens -- Bits 62 .. 18 (45 bits) is the bitwise-not (~) of the `value_extension`. +- Bits 62 .. 17 (46 bits) is the bitwise-not (~) of the `value_extension`. Extended tokens are typically part of a multi-token chain whose first token is a simple token that provides the semantics for each `value_extension`. @@ -73,7 +70,7 @@ a simple token that provides the semantics for each `value_extension`. ### Simple Tokens - Bits 62 .. 42 (21 bits) is the `value_major`. -- Bits 41 .. 18 (24 bits) is the `value_minor`. +- Bits 41 .. 17 (25 bits) is the `value_minor`. The `value_major` is a 21-bit [Base38](doc/note/base38-and-fourcc.md) number. For example, an HTML tokenizer might produce a combination of "base" tokens @@ -90,13 +87,13 @@ tokenizer's package assigns to it. A zero `value_major` is reserved for Wuffs' built-in "base" package. The `value_minor` is further sub-divided: - - Bits 41 .. 39 (3 bits) is the `VBC` (`value_base_category`). - - Bits 38 .. 18 (21 bits) is the `VBD` (`value_base_detail`). +- Bits 41 .. 38 (4 bits) is the `VBC` (`value_base_category`). +- Bits 37 .. 17 (21 bits) is the `VBD` (`value_base_detail`). -The high 46 bits (bits 63 .. 18) only have `VBC` and `VBD` semantics when the +The high 47 bits (bits 63 .. 17) only have `VBC` and `VBD` semantics when the high 22 bits (the `extended` and `value_major` parts) are all zero. An -equivalent test is that the high 25 bits (the notional `VBC`), as either an -unsigned integer or a sign-extended integer, is in the range `0 ..= 7`. +equivalent test is that the high 26 bits (the notional `VBC`), as either an +unsigned integer or a sign-extended integer, is in the range `0 ..= 15`. These `VBC`s organize tokens into broad groups, generally applicable (as opposed to being e.g. HTML-specific or JSON-specific). For example, strings and @@ -142,15 +139,17 @@ entire program (not just the Wuffs library) never calls `malloc`. ## Example Token Stream ``` -$ gcc script/print-json-token-debug-format.c && \ -> ./a.out -all-tokens -human-readable < test/data/json-things.formatted.json -pos=0x00000000 len=0x0001 link=0b00 vbc=1:Structure........ vbd=0x004011 -pos=0x00000001 len=0x0005 link=0b00 vbc=0:Filler........... vbd=0x000000 -pos=0x00000006 len=0x0001 link=0b01 vbc=2:String........... vbd=0x000013 -pos=0x00000007 len=0x0002 link=0b11 vbc=2:String........... vbd=0x000021 -pos=0x00000009 len=0x0001 link=0b10 vbc=2:String........... vbd=0x000013 +$ gcc script/print-json-token-debug-format.c -o pjtdf +$ ./pjtdf -all-tokens -human-readable < test/data/json-things.formatted.json +pos=0x00000000 len=0x0001 con=0 vbc=1:Structure........ vbd=0x004011 +pos=0x00000001 len=0x0005 con=0 vbc=0:Filler........... vbd=0x000000 +pos=0x00000006 len=0x0001 con=1 vbc=2:String........... vbd=0x000013 +pos=0x00000007 len=0x0002 con=1 vbc=2:String........... vbd=0x000021 +pos=0x00000009 len=0x0001 con=0 vbc=2:String........... vbd=0x000013 etc -pos=0x00000094 len=0x0001 link=0b10 vbc=2:String........... vbd=0x000013 -pos=0x00000095 len=0x0001 link=0b00 vbc=0:Filler........... vbd=0x000000 -pos=0x00000096 len=0x0001 link=0b00 vbc=1:Structure........ vbd=0x001042 +pos=0x00000090 len=0x0002 con=1 vbc=3:UnicodeCodePoint. vbd=0x00000A +pos=0x00000092 len=0x0002 con=1 vbc=3:UnicodeCodePoint. vbd=0x00000A +pos=0x00000094 len=0x0001 con=0 vbc=2:String........... vbd=0x000013 +pos=0x00000095 len=0x0001 con=0 vbc=0:Filler........... vbd=0x000000 +pos=0x00000096 len=0x0001 con=0 vbc=1:Structure........ vbd=0x001042 ``` diff --git a/example/jsonfindptrs/jsonfindptrs.cc b/example/jsonfindptrs/jsonfindptrs.cc index 2bf74f98..5c5816fb 100644 --- a/example/jsonfindptrs/jsonfindptrs.cc +++ b/example/jsonfindptrs/jsonfindptrs.cc @@ -674,7 +674,7 @@ JsonThing::parse_string(TokenStream& ts, TokenStream::Result tsr) { return Result("main: internal error: unexpected token"); } - if (!tsr.token.link_next()) { + if (!tsr.token.continued()) { break; } tsr = ts.next(); diff --git a/example/jsonptr/jsonptr.cc b/example/jsonptr/jsonptr.cc index e4aa8a7a..7c3dc2c2 100644 --- a/example/jsonptr/jsonptr.cc +++ b/example/jsonptr/jsonptr.cc @@ -979,15 +979,15 @@ handle_token(wuffs_base__token t, bool start_of_token_chain) { return "main: internal error: unexpected string-token conversion"; } - if (t.link_next()) { + if (t.continued()) { return nullptr; } TRY(write_dst("\"", 1)); goto after_value; case WUFFS_BASE__TOKEN__VBC__UNICODE_CODE_POINT: - if (!t.link_next()) { - return "main: internal error: unexpected unlinked token"; + if (!t.continued()) { + return "main: internal error: unexpected non-continued UCP token"; } TRY(handle_unicode_code_point(vbd)); g_query.incremental_match_code_point(vbd); @@ -1049,12 +1049,12 @@ main1(int argc, char** argv) { // Skip filler tokens (e.g. whitespace). if (t.value() == 0) { - start_of_token_chain = !t.link_next(); + start_of_token_chain = !t.continued(); continue; } const char* z = handle_token(t, start_of_token_chain); - start_of_token_chain = !t.link_next(); + start_of_token_chain = !t.continued(); if (z == nullptr) { continue; } else if (z == g_eod) { diff --git a/fuzz/c/std/json_fuzzer.c b/fuzz/c/std/json_fuzzer.c index c3ae16ee..916237c3 100644 --- a/fuzz/c/std/json_fuzzer.c +++ b/fuzz/c/std/json_fuzzer.c @@ -196,7 +196,7 @@ fuzz_one_token(wuffs_base__token t, // After a complete JSON value, update the parity (even/odd count) of the // container. - if (!wuffs_base__token__link_next(&t) && + if (!wuffs_base__token__continued(&t) && (vbc != WUFFS_BASE__TOKEN__VBC__FILLER) && ((vbc != WUFFS_BASE__TOKEN__VBC__STRUCTURE) || (vbd & WUFFS_BASE__TOKEN__VBD__STRUCTURE__POP))) { @@ -368,8 +368,8 @@ fuzz_complex(wuffs_base__io_buffer* full_src, uint32_t hash_24_bits) { if (depth != 0) { return "fuzz: internal error: decoded OK but final depth was not zero"; - } else if (wuffs_base__token__link_next(&final_token)) { - return "fuzz: internal error: decoded OK but final token had link_next"; + } else if (wuffs_base__token__continued(&final_token)) { + return "fuzz: internal error: decoded OK but final token was continued"; } return NULL; } diff --git a/internal/cgen/base/token-public.h b/internal/cgen/base/token-public.h index aa37f135..eb05a760 100644 --- a/internal/cgen/base/token-public.h +++ b/internal/cgen/base/token-public.h @@ -29,8 +29,7 @@ typedef struct { inline int64_t value_base_category() const; inline uint64_t value_minor() const; inline uint64_t value_base_detail() const; - inline bool link_prev() const; - inline bool link_next() const; + inline bool continued() const; inline uint64_t length() const; #endif // __cplusplus @@ -47,18 +46,15 @@ wuffs_base__make_token(uint64_t repr) { #define WUFFS_BASE__TOKEN__LENGTH__MAX_INCL 0xFFFF -#define WUFFS_BASE__TOKEN__VALUE__SHIFT 18 -#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT 18 +#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_BASE_CATEGORY__SHIFT 39 -#define WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT 18 -#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT 18 -#define WUFFS_BASE__TOKEN__LINK__SHIFT 16 +#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__LINK_PREV 0x20000 -#define WUFFS_BASE__TOKEN__LINK_NEXT 0x10000 - // -------- #define WUFFS_BASE__TOKEN__VBC__FILLER 0 @@ -179,7 +175,7 @@ wuffs_base__token__value_base_category(const wuffs_base__token* t) { static inline uint64_t // wuffs_base__token__value_minor(const wuffs_base__token* t) { - return (t->repr >> WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) & 0xFFFFFF; + return (t->repr >> WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) & 0x1FFFFFF; } static inline uint64_t // @@ -188,13 +184,8 @@ wuffs_base__token__value_base_detail(const wuffs_base__token* t) { } static inline bool // -wuffs_base__token__link_prev(const wuffs_base__token* t) { - return t->repr & WUFFS_BASE__TOKEN__LINK_PREV; -} - -static inline bool // -wuffs_base__token__link_next(const wuffs_base__token* t) { - return t->repr & WUFFS_BASE__TOKEN__LINK_NEXT; +wuffs_base__token__continued(const wuffs_base__token* t) { + return t->repr & 0x10000; } static inline uint64_t // @@ -235,13 +226,8 @@ wuffs_base__token::value_base_detail() const { } inline bool // -wuffs_base__token::link_prev() const { - return wuffs_base__token__link_prev(this); -} - -inline bool // -wuffs_base__token::link_next() const { - return wuffs_base__token__link_next(this); +wuffs_base__token::continued() const { + return wuffs_base__token__continued(this); } inline uint64_t // diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index 197c7f36..5eca9123 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -350,7 +350,7 @@ func (g *gen) writeBuiltinTokenWriter(b *buffer, recv *a.Expr, method t.ID, args if err := g.writeExpr(b, args[2].AsArg().Value(), depth); err != nil { return err } - b.writes(")) << WUFFS_BASE__TOKEN__LINK__SHIFT) | (((uint64_t)(") + b.writes(")) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(") } if err := g.writeExpr(b, args[3].AsArg().Value(), depth); err != nil { diff --git a/internal/cgen/data.go b/internal/cgen/data.go index 7d5d0e64..82a39737 100644 --- a/internal/cgen/data.go +++ b/internal/cgen/data.go @@ -382,9 +382,9 @@ const baseTokenPrivateH = "" + "" const baseTokenPublicH = "" + - "// ---------------- Tokens\n\n// wuffs_base__token is an element of a byte stream's tokenization.\n//\n// See https://github.com/google/wuffs/blob/master/doc/note/tokens.md\ntypedef struct {\n uint64_t repr;\n\n#ifdef __cplusplus\n inline int64_t value() const;\n inline int64_t value_extension() const;\n inline int64_t value_major() const;\n inline int64_t value_base_category() const;\n inline uint64_t value_minor() const;\n inline uint64_t value_base_detail() const;\n inline bool link_prev() const;\n inline bool link_next() const;\n inline uint64_t length() const;\n#endif // __cplusplus\n\n} wuffs_base__token;\n\nstatic inline wuffs_base__token //\nwuffs_base__make_token(uint64_t repr) {\n wuffs_base__token ret;\n ret.repr = repr;\n return ret;\n}\n\n " + + "// ---------------- Tokens\n\n// wuffs_base__token is an element of a byte stream's tokenization.\n//\n// See https://github.com/google/wuffs/blob/master/doc/note/tokens.md\ntypedef struct {\n uint64_t repr;\n\n#ifdef __cplusplus\n inline int64_t value() const;\n inline int64_t value_extension() const;\n inline int64_t value_major() const;\n inline int64_t value_base_category() const;\n inline uint64_t value_minor() const;\n inline uint64_t value_base_detail() const;\n inline bool continued() const;\n inline uint64_t length() const;\n#endif // __cplusplus\n\n} wuffs_base__token;\n\nstatic inline wuffs_base__token //\nwuffs_base__make_token(uint64_t repr) {\n wuffs_base__token ret;\n ret.repr = repr;\n return ret;\n}\n\n " + "" + - "// --------\n\n#define WUFFS_BASE__TOKEN__LENGTH__MAX_INCL 0xFFFF\n\n#define WUFFS_BASE__TOKEN__VALUE__SHIFT 18\n#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT 18\n#define WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT 42\n#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT 39\n#define WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT 18\n#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT 18\n#define WUFFS_BASE__TOKEN__LINK__SHIFT 16\n#define WUFFS_BASE__TOKEN__LENGTH__SHIFT 0\n\n#define WUFFS_BASE__TOKEN__LINK_PREV 0x20000\n#define WUFFS_BASE__TOKEN__LINK_NEXT 0x10000\n\n " + + "// --------\n\n#define WUFFS_BASE__TOKEN__LENGTH__MAX_INCL 0xFFFF\n\n#define WUFFS_BASE__TOKEN__VALUE__SHIFT 17\n#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT 17\n#define WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT 42\n#define WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT 17\n#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT 38\n#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT 17\n#define WUFFS_BASE__TOKEN__CONTINUED__SHIFT 16\n#define WUFFS_BASE__TOKEN__LENGTH__SHIFT 0\n\n " + "" + "// --------\n\n#define WUFFS_BASE__TOKEN__VBC__FILLER 0\n#define WUFFS_BASE__TOKEN__VBC__STRUCTURE 1\n#define WUFFS_BASE__TOKEN__VBC__STRING 2\n#define WUFFS_BASE__TOKEN__VBC__UNICODE_CODE_POINT 3\n#define WUFFS_BASE__TOKEN__VBC__LITERAL 4\n#define WUFFS_BASE__TOKEN__VBC__NUMBER 5\n\n " + "" + @@ -401,8 +401,8 @@ const baseTokenPublicH = "" + "ttle-endian or text. For binary formats, the\n// token length discriminates e.g. u16 little-endian vs u32 little-endian.\n#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_BIG_ENDIAN 0x00100\n#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_LITTLE_ENDIAN 0x00200\n#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_TEXT 0x00400\n\n" + "" + "// --------\n\n// wuffs_base__token__value returns the token's high 46 bits, sign-extended. A\n// negative value means an extended token, non-negative means a simple token.\nstatic inline int64_t //\nwuffs_base__token__value(const wuffs_base__token* t) {\n return ((int64_t)(t->repr)) >> WUFFS_BASE__TOKEN__VALUE__SHIFT;\n}\n\n// wuffs_base__token__value_extension returns a negative value if the token was\n// not an extended token.\nstatic inline int64_t //\nwuffs_base__token__value_extension(const wuffs_base__token* t) {\n return (~(int64_t)(t->repr)) >> WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT;\n}\n\n// wuffs_base__token__value_major returns a negative value if the token was not\n// a simple token.\nstatic inline int64_t //\nwuffs_base__token__value_major(const wuffs_base__token* t) {\n return ((int64_t)(t->repr)) >> WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT;\n}\n\n// wuffs_base__token__value_base_category returns a negative value if the token\n// was not a simple token.\nstatic inline int64_t //\nwuffs_base__token__value_base_cat" + - "egory(const wuffs_base__token* t) {\n return ((int64_t)(t->repr)) >> WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT;\n}\n\nstatic inline uint64_t //\nwuffs_base__token__value_minor(const wuffs_base__token* t) {\n return (t->repr >> WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) & 0xFFFFFF;\n}\n\nstatic inline uint64_t //\nwuffs_base__token__value_base_detail(const wuffs_base__token* t) {\n return (t->repr >> WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT) & 0x1FFFFF;\n}\n\nstatic inline bool //\nwuffs_base__token__link_prev(const wuffs_base__token* t) {\n return t->repr & WUFFS_BASE__TOKEN__LINK_PREV;\n}\n\nstatic inline bool //\nwuffs_base__token__link_next(const wuffs_base__token* t) {\n return t->repr & WUFFS_BASE__TOKEN__LINK_NEXT;\n}\n\nstatic inline uint64_t //\nwuffs_base__token__length(const wuffs_base__token* t) {\n return (t->repr >> WUFFS_BASE__TOKEN__LENGTH__SHIFT) & 0xFFFF;\n}\n\n#ifdef __cplusplus\n\ninline int64_t //\nwuffs_base__token::value() const {\n return wuffs_base__token__value(this);\n}\n\ninline int64_t //\nwuffs_base_" + - "_token::value_extension() const {\n return wuffs_base__token__value_extension(this);\n}\n\ninline int64_t //\nwuffs_base__token::value_major() const {\n return wuffs_base__token__value_major(this);\n}\n\ninline int64_t //\nwuffs_base__token::value_base_category() const {\n return wuffs_base__token__value_base_category(this);\n}\n\ninline uint64_t //\nwuffs_base__token::value_minor() const {\n return wuffs_base__token__value_minor(this);\n}\n\ninline uint64_t //\nwuffs_base__token::value_base_detail() const {\n return wuffs_base__token__value_base_detail(this);\n}\n\ninline bool //\nwuffs_base__token::link_prev() const {\n return wuffs_base__token__link_prev(this);\n}\n\ninline bool //\nwuffs_base__token::link_next() const {\n return wuffs_base__token__link_next(this);\n}\n\ninline uint64_t //\nwuffs_base__token::length() const {\n return wuffs_base__token__length(this);\n}\n\n#endif // __cplusplus\n\n" + + "egory(const wuffs_base__token* t) {\n return ((int64_t)(t->repr)) >> WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT;\n}\n\nstatic inline uint64_t //\nwuffs_base__token__value_minor(const wuffs_base__token* t) {\n return (t->repr >> WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) & 0x1FFFFFF;\n}\n\nstatic inline uint64_t //\nwuffs_base__token__value_base_detail(const wuffs_base__token* t) {\n return (t->repr >> WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT) & 0x1FFFFF;\n}\n\nstatic inline bool //\nwuffs_base__token__continued(const wuffs_base__token* t) {\n return t->repr & 0x10000;\n}\n\nstatic inline uint64_t //\nwuffs_base__token__length(const wuffs_base__token* t) {\n return (t->repr >> WUFFS_BASE__TOKEN__LENGTH__SHIFT) & 0xFFFF;\n}\n\n#ifdef __cplusplus\n\ninline int64_t //\nwuffs_base__token::value() const {\n return wuffs_base__token__value(this);\n}\n\ninline int64_t //\nwuffs_base__token::value_extension() const {\n return wuffs_base__token__value_extension(this);\n}\n\ninline int64_t //\nwuffs_base__token::value_major() const {\n retu" + + "rn wuffs_base__token__value_major(this);\n}\n\ninline int64_t //\nwuffs_base__token::value_base_category() const {\n return wuffs_base__token__value_base_category(this);\n}\n\ninline uint64_t //\nwuffs_base__token::value_minor() const {\n return wuffs_base__token__value_minor(this);\n}\n\ninline uint64_t //\nwuffs_base__token::value_base_detail() const {\n return wuffs_base__token__value_base_detail(this);\n}\n\ninline bool //\nwuffs_base__token::continued() const {\n return wuffs_base__token__continued(this);\n}\n\ninline uint64_t //\nwuffs_base__token::length() const {\n return wuffs_base__token__length(this);\n}\n\n#endif // __cplusplus\n\n" + "" + "// --------\n\ntypedef WUFFS_BASE__SLICE(wuffs_base__token) wuffs_base__slice_token;\n\nstatic inline wuffs_base__slice_token //\nwuffs_base__make_slice_token(wuffs_base__token* ptr, size_t len) {\n wuffs_base__slice_token ret;\n ret.ptr = ptr;\n ret.len = len;\n return ret;\n}\n\n" + "" + diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 1bd52cca..34ba6ec4 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -332,8 +332,8 @@ var Funcs = []string{ // ---- token_writer "token_writer.write_simple_token_fast!(" + - "value_major: u32[..= 0x1F_FFFF], value_minor: u32[..= 0xFF_FFFF]," + - "link: u32[..= 0x3], length: u32[..= 0xFFFF])", + "value_major: u32[..= 0x1F_FFFF], value_minor: u32[..= 0x1FF_FFFF]," + + "continued: u32[..= 0x1], length: u32[..= 0xFFFF])", "token_writer.available() u64", diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 9b0b950d..ed2198f5 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -1888,8 +1888,7 @@ typedef struct { inline int64_t value_base_category() const; inline uint64_t value_minor() const; inline uint64_t value_base_detail() const; - inline bool link_prev() const; - inline bool link_next() const; + inline bool continued() const; inline uint64_t length() const; #endif // __cplusplus @@ -1906,18 +1905,15 @@ wuffs_base__make_token(uint64_t repr) { #define WUFFS_BASE__TOKEN__LENGTH__MAX_INCL 0xFFFF -#define WUFFS_BASE__TOKEN__VALUE__SHIFT 18 -#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT 18 +#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_BASE_CATEGORY__SHIFT 39 -#define WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT 18 -#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT 18 -#define WUFFS_BASE__TOKEN__LINK__SHIFT 16 +#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__LINK_PREV 0x20000 -#define WUFFS_BASE__TOKEN__LINK_NEXT 0x10000 - // -------- #define WUFFS_BASE__TOKEN__VBC__FILLER 0 @@ -2038,7 +2034,7 @@ wuffs_base__token__value_base_category(const wuffs_base__token* t) { static inline uint64_t // wuffs_base__token__value_minor(const wuffs_base__token* t) { - return (t->repr >> WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) & 0xFFFFFF; + return (t->repr >> WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) & 0x1FFFFFF; } static inline uint64_t // @@ -2047,13 +2043,8 @@ wuffs_base__token__value_base_detail(const wuffs_base__token* t) { } static inline bool // -wuffs_base__token__link_prev(const wuffs_base__token* t) { - return t->repr & WUFFS_BASE__TOKEN__LINK_PREV; -} - -static inline bool // -wuffs_base__token__link_next(const wuffs_base__token* t) { - return t->repr & WUFFS_BASE__TOKEN__LINK_NEXT; +wuffs_base__token__continued(const wuffs_base__token* t) { + return t->repr & 0x10000; } static inline uint64_t // @@ -2094,13 +2085,8 @@ wuffs_base__token::value_base_detail() const { } inline bool // -wuffs_base__token::link_prev() const { - return wuffs_base__token__link_prev(this); -} - -inline bool // -wuffs_base__token::link_next() const { - return wuffs_base__token__link_next(this); +wuffs_base__token::continued() const { + return wuffs_base__token__continued(this); } inline uint64_t // @@ -6134,9 +6120,6 @@ struct wuffs_json__decoder__struct { uint32_t v_expect; uint32_t v_expect_after_value; } s_decode_tokens[1]; - struct { - uint32_t v_link_prev; - } s_decode_comment[1]; struct { uint32_t v_neg; } s_decode_inf_nan[1]; @@ -21233,7 +21216,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, if (v_class == 1) { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194323)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); (iop_a_src += 1, wuffs_base__make_empty_struct()); label__string_loop_outer__continue:; @@ -21252,7 +21235,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_string_length = 0; @@ -21281,7 +21264,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)((v_string_length + 4))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_string_length = 0; @@ -21298,7 +21281,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(65532)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_string_length = 0; @@ -21311,7 +21294,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_string_length = 0; @@ -21322,7 +21305,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_string_length = 0; @@ -21352,7 +21335,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, (((uint64_t)( (6291456 | ((uint32_t)((v_backslash & 127)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(2)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__string_loop_outer__continue; } else if (v_backslash != 0) { @@ -21365,7 +21348,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, ((uint32_t)(wuffs_json__lut_quirky_backslashes[( v_backslash & 7)]))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(2)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__string_loop_outer__continue; } @@ -21411,7 +21395,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)((6291456 | v_uni4_value))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(6)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__string_loop_outer__continue; } else if (v_uni4_value >= 56320) { @@ -21424,8 +21409,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(6356989)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) - << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(6)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__string_loop_outer__continue; @@ -21481,7 +21466,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, (((uint64_t)((6291456 | v_uni4_high_surrogate | v_uni4_value))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(12)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__string_loop_outer__continue; @@ -21498,7 +21484,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(6356989)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(6)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__string_loop_outer__continue; } @@ -21562,7 +21549,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)((6291456 | (v_uni8_value & 2097151)))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(10)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__string_loop_outer__continue; } else if (self->private_impl @@ -21571,7 +21559,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(6356989)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(10)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__string_loop_outer__continue; } @@ -21619,7 +21608,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194432)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(v_backslash_x_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__string_loop_outer__continue; @@ -21633,7 +21622,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_string_length = 0; @@ -21647,7 +21637,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(6356989)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); (iop_a_src += 1, wuffs_base__make_empty_struct()); @@ -21674,7 +21665,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)((v_string_length + 2))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_string_length = 0; @@ -21689,7 +21681,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_string_length = 0; @@ -21703,7 +21696,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(6356989)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); (iop_a_src += 1, wuffs_base__make_empty_struct()); @@ -21734,7 +21728,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)((v_string_length + 3))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_string_length = 0; @@ -21750,7 +21745,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_string_length = 0; @@ -21764,7 +21760,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(6356989)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); (iop_a_src += 1, wuffs_base__make_empty_struct()); @@ -21795,7 +21792,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) + << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)((v_string_length + 4))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_string_length = 0; @@ -21810,7 +21808,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_string_length = 0; @@ -21824,7 +21822,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)((6291456 | ((uint32_t)((v_char & 127)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); (iop_a_src += 1, wuffs_base__make_empty_struct()); goto label__string_loop_outer__continue; @@ -21837,7 +21835,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(6356989)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); (iop_a_src += 1, wuffs_base__make_empty_struct()); goto label__string_loop_outer__continue; @@ -21869,7 +21867,6 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194323)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(2)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__2__break; } @@ -22566,7 +22563,6 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self, uint8_t v_c = 0; uint16_t v_c2 = 0; - uint32_t v_link_prev = 0; uint32_t v_length = 0; wuffs_base__token* iop_a_dst = NULL; @@ -22594,9 +22590,6 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self, } uint32_t coro_susp_point = self->private_impl.p_decode_comment[0]; - if (coro_susp_point) { - v_link_prev = self->private_data.s_decode_comment[0].v_link_prev; - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -22633,10 +22626,8 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self, if (v_length > 0) { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(2)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)((1 | v_link_prev))) - << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(v_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); - v_link_prev = 2; } if (a_src && a_src->meta.closed) { status = wuffs_base__make_status(wuffs_json__error__bad_input); @@ -22653,7 +22644,6 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self, (iop_a_src += 2, wuffs_base__make_empty_struct()); *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(2)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(v_link_prev)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | (((uint64_t)((v_length + 2))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); status = wuffs_base__make_status(NULL); @@ -22663,12 +22653,10 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self, if (v_length >= 65533) { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(2)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)((1 | v_link_prev))) - << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)((v_length + 1))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_length = 0; - v_link_prev = 2; goto label__comment_block__continue; } v_length += 1; @@ -22691,10 +22679,8 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self, if (v_length > 0) { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(1)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)((1 | v_link_prev))) - << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(v_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); - v_link_prev = 2; } if (a_src && a_src->meta.closed) { status = wuffs_base__make_status(wuffs_json__error__bad_input); @@ -22711,7 +22697,6 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self, (iop_a_src += 1, wuffs_base__make_empty_struct()); *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(1)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(v_link_prev)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | (((uint64_t)((v_length + 1))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); status = wuffs_base__make_status(NULL); @@ -22721,12 +22706,10 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self, if (v_length >= 65533) { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(1)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)((1 | v_link_prev))) - << WUFFS_BASE__TOKEN__LINK__SHIFT) | + (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)((v_length + 1))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); v_length = 0; - v_link_prev = 2; goto label__comment_line__continue; } v_length += 1; @@ -22745,7 +22728,6 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self, suspend: self->private_impl.p_decode_comment[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0; - self->private_data.s_decode_comment[0].v_link_prev = v_link_prev; goto exit; exit: diff --git a/script/print-json-token-debug-format.c b/script/print-json-token-debug-format.c index 89877b98..e8a81bc1 100644 --- a/script/print-json-token-debug-format.c +++ b/script/print-json-token-debug-format.c @@ -24,16 +24,15 @@ // It prints 16 bytes (128 bits) per token, containing big-endian numbers: // // +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ -// | | | | | | VALUE_EXTENSION | -// | POS | LEN | LP| LN|EXT|VALUE_MAJOR| VALUE_MINOR | -// | | | | | | 0 |VBC| VBD | +// | | | | | VALUE_EXTENSION | +// | POS | LEN | CON |EXT|VALUE_MAJOR| VALUE_MINOR | +// | | | | | 0 |VBC| VBD | // +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ // // - POS (4 bytes) is the position: the sum of all previous tokens' lengths, // including elided tokens. // - LEN (2 bytes) is the length. -// - LP (1 bytes) is the link_prev bit. -// - LN (1 bytes) is the link_next bit +// - CON (2 bytes) is the continued bit // - EXT (1 bytes) is 1 for extended and 0 for simple tokens. // // Extended tokens have a VALUE_EXTENSION (7 bytes). @@ -54,8 +53,8 @@ // If the input or output is larger than the program's buffers (64 MiB and // 131072 tokens by default), there may be multiple valid tokenizations of any // given input. For example, if a source string "abcde" straddles an I/O -// boundary, it may be tokenized as single (no-link) 5-length string or as a -// 3-length link_next'ed string followed by a 2-length link_prev'ed string. +// boundary, it may be tokenized as single (not continued) 5-length string or +// as a 3-length continued string followed by a 2-length string. // // A Wuffs token stream, in general, can support inputs more than 0xFFFF_FFFF // bytes long, but this program can not, as it tracks the tokens' cumulative @@ -202,7 +201,7 @@ parse_flags(int argc, char** argv) { return NULL; } -const char* g_vbc_names[8] = { +const char* g_vbc_names[16] = { "0:Filler..........", // "1:Structure.......", // "2:String..........", // @@ -211,6 +210,14 @@ const char* g_vbc_names[8] = { "5:Number..........", // "6:Reserved........", // "7:Reserved........", // + "8:Reserved........", // + "9:Reserved........", // + "A:Reserved........", // + "B:Reserved........", // + "C:Reserved........", // + "D:Reserved........", // + "E:Reserved........", // + "F:Reserved........", // }; const int g_base38_decode[38] = { @@ -277,16 +284,15 @@ main1(int argc, char** argv) { uint16_t len = wuffs_base__token__length(t); if (g_flags.all_tokens || (wuffs_base__token__value(t) != 0)) { - uint8_t lp = wuffs_base__token__link_prev(t) ? 1 : 0; - uint8_t ln = wuffs_base__token__link_next(t) ? 1 : 0; + uint16_t con = wuffs_base__token__continued(t) ? 1 : 0; int32_t vmajor = wuffs_base__token__value_major(t); uint32_t vminor = wuffs_base__token__value_minor(t); uint8_t vbc = wuffs_base__token__value_base_category(t); uint32_t vbd = wuffs_base__token__value_base_detail(t); if (g_flags.human_readable) { - printf("pos=0x%08" PRIX32 " len=0x%04" PRIX16 " link=0b%d%d ", - (uint32_t)(pos), len, (int)(lp), (int)(ln)); + printf("pos=0x%08" PRIX32 " len=0x%04" PRIX16 " con=%" PRId16 " ", + (uint32_t)(pos), len, con); if (vmajor > 0) { uint32_t m = vmajor; @@ -302,7 +308,8 @@ main1(int argc, char** argv) { vmajor, g_base38_decode[m0], g_base38_decode[m1], g_base38_decode[m2], g_base38_decode[m3], vminor); } else if (vmajor == 0) { - printf("vbc=%s. vbd=0x%06" PRIX32 "\n", g_vbc_names[vbc & 7], vbd); + printf("vbc=%s. vbd=0x%06" PRIX32 "\n", g_vbc_names[vbc & 15], + vbd); } else { printf("extended... vextension=0x%012" PRIX64 "\n", wuffs_base__token__value_extension(t)); @@ -312,8 +319,7 @@ main1(int argc, char** argv) { uint8_t buf[16]; wuffs_base__store_u32be__no_bounds_check(&buf[0x0], (uint32_t)(pos)); wuffs_base__store_u16be__no_bounds_check(&buf[0x4], len); - wuffs_base__store_u8__no_bounds_check(&buf[0x0006], lp); - wuffs_base__store_u8__no_bounds_check(&buf[0x0007], ln); + wuffs_base__store_u16be__no_bounds_check(&buf[0x6], con); if (vmajor > 0) { wuffs_base__store_u32be__no_bounds_check(&buf[0x8], vmajor); wuffs_base__store_u32be__no_bounds_check(&buf[0xC], vminor); diff --git a/std/json/decode_json.wuffs b/std/json/decode_json.wuffs index c5169d31..44f78e05 100644 --- a/std/json/decode_json.wuffs +++ b/std/json/decode_json.wuffs @@ -188,7 +188,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0, - link: 0x0, + continued: 0, length: whitespace_length) whitespace_length = 0 } @@ -211,7 +211,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0, - link: 0x0, + continued: 0, length: 0xFFFF) whitespace_length = 0 continue.outer @@ -224,7 +224,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0, - link: 0x0, + continued: 0, length: whitespace_length) whitespace_length = 0 if args.dst.available() <= 0 { @@ -250,7 +250,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0013, - link: 0x1, + continued: 1, length: 1) args.src.skip32_fast!(actual: 1, worst_case: 1) @@ -269,7 +269,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0021, - link: 0x3, + continued: 1, length: string_length) string_length = 0 } @@ -299,7 +299,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0021, - link: 0x3, + continued: 1, length: string_length + 4) string_length = 0 continue.string_loop_outer @@ -316,7 +316,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0021, - link: 0x3, + continued: 1, length: 0xFFFC) string_length = 0 continue.string_loop_outer @@ -329,7 +329,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0021, - link: 0x3, + continued: 1, length: string_length) string_length = 0 } @@ -340,7 +340,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0021, - link: 0x3, + continued: 1, length: string_length) string_length = 0 if args.dst.available() <= 0 { @@ -365,7 +365,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_0000 | ((backslash & 0x7F) as base.u32), - link: 0x3, + continued: 1, length: 2) continue.string_loop_outer @@ -375,7 +375,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_0000 | (lut_quirky_backslashes[backslash & 7] as base.u32), - link: 0x3, + continued: 1, length: 2) continue.string_loop_outer } @@ -419,7 +419,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_0000 | uni4_value, - link: 0x3, + continued: 1, length: 6) continue.string_loop_outer @@ -440,7 +440,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_FFFD, - link: 0x3, + continued: 1, length: 6) continue.string_loop_outer } @@ -491,7 +491,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_0000 | uni4_high_surrogate | uni4_value, - link: 0x3, + continued: 1, length: 12) continue.string_loop_outer } @@ -505,7 +505,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_FFFD, - link: 0x3, + continued: 1, length: 6) continue.string_loop_outer } @@ -563,7 +563,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_0000 | (uni8_value & 0x1F_FFFF), - link: 0x3, + continued: 1, length: 10) continue.string_loop_outer } else if this.quirk_enabled_replace_invalid_unicode { @@ -571,7 +571,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_FFFD, - link: 0x3, + continued: 1, length: 10) continue.string_loop_outer } @@ -618,7 +618,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0080, - link: 0x3, + continued: 1, length: backslash_x_length) continue.string_loop_outer // -------- END backslash-x @@ -632,7 +632,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0021, - link: 0x3, + continued: 1, length: string_length) string_length = 0 if args.dst.available() <= 0 { @@ -644,7 +644,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_FFFD, - link: 0x3, + continued: 1, length: 1) args.src.skip32_fast!(actual: 1, worst_case: 1) continue.string_loop_outer @@ -665,7 +665,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0021, - link: 0x3, + continued: 1, length: string_length + 2) string_length = 0 continue.string_loop_outer @@ -680,7 +680,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0021, - link: 0x3, + continued: 1, length: string_length) string_length = 0 if args.dst.available() <= 0 { @@ -692,7 +692,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_FFFD, - link: 0x3, + continued: 1, length: 1) args.src.skip32_fast!(actual: 1, worst_case: 1) continue.string_loop_outer @@ -717,7 +717,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0021, - link: 0x3, + continued: 1, length: string_length + 3) string_length = 0 continue.string_loop_outer @@ -733,7 +733,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0021, - link: 0x3, + continued: 1, length: string_length) string_length = 0 if args.dst.available() <= 0 { @@ -745,7 +745,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_FFFD, - link: 0x3, + continued: 1, length: 1) args.src.skip32_fast!(actual: 1, worst_case: 1) continue.string_loop_outer @@ -769,7 +769,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0021, - link: 0x3, + continued: 1, length: string_length + 4) string_length = 0 continue.string_loop_outer @@ -784,7 +784,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0021, - link: 0x3, + continued: 1, length: string_length) string_length = 0 if args.dst.available() <= 0 { @@ -796,7 +796,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_0000 | ((char & 0x7F) as base.u32), - link: 0x3, + continued: 1, length: 1) args.src.skip32_fast!(actual: 1, worst_case: 1) continue.string_loop_outer @@ -807,7 +807,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x60_FFFD, - link: 0x3, + continued: 1, length: 1) args.src.skip32_fast!(actual: 1, worst_case: 1) continue.string_loop_outer @@ -833,7 +833,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x40_0013, - link: 0x2, + continued: 0, length: 1) break } endwhile @@ -854,7 +854,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0, - link: 0x0, + continued: 0, length: 1) // What's valid after a comma depends on whether or not we're in an // array or an object. @@ -879,7 +879,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0, - link: 0x0, + continued: 0, length: 1) expect = 0x1EB2 // 0x1EB2 is EXPECT_VALUE. continue.outer @@ -900,7 +900,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: vminor, - link: 0x0, + continued: 0, length: number_length) break } @@ -955,7 +955,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: vminor, - link: 0x0, + continued: 0, length: 1) expect = 0x1042 // 0x1042 is (EXPECT_CLOSE_CURLY_BRACE | EXPECT_STRING). expect_after_value = 0x1044 // 0x1044 is (EXPECT_CURLY_CLOSE_BRACE | EXPECT_COMMA). @@ -967,7 +967,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x20_1042, - link: 0x0, + continued: 0, length: 1) break.outer } @@ -978,7 +978,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x20_2042, - link: 0x0, + continued: 0, length: 1) // 0x1104 is (EXPECT_SQUARE_CLOSE_BRACKET | EXPECT_COMMA). expect = 0x1104 @@ -987,7 +987,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x20_4042, - link: 0x0, + continued: 0, length: 1) // 0x1044 is (EXPECT_CURLY_CLOSE_BRACE | EXPECT_COMMA). expect = 0x1044 @@ -1016,7 +1016,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: vminor, - link: 0x0, + continued: 0, length: 1) expect = 0x1FB2 // 0x1FB2 is (EXPECT_CLOSE_SQUARE_BRACKET | EXPECT_VALUE). expect_after_value = 0x1104 // 0x1104 is (EXPECT_CLOSE_SQUARE_BRACKET | EXPECT_COMMA). @@ -1028,7 +1028,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x20_1022, - link: 0x0, + continued: 0, length: 1) break.outer } @@ -1039,7 +1039,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x20_2022, - link: 0x0, + continued: 0, length: 1) // 0x1104 is (EXPECT_CLOSE_SQUARE_BRACKET | EXPECT_COMMA). expect = 0x1104 @@ -1048,7 +1048,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x20_4022, - link: 0x0, + continued: 0, length: 1) // 0x1044 is (EXPECT_CLOSE_CURLY_BRACE | EXPECT_COMMA). expect = 0x1044 @@ -1062,7 +1062,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x80_0004, - link: 0x0, + continued: 0, length: 5) if args.src.available() < 5 { return "#internal error: inconsistent I/O" @@ -1080,7 +1080,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x80_0008, - link: 0x0, + continued: 0, length: 4) if args.src.available() < 4 { return "#internal error: inconsistent I/O" @@ -1098,7 +1098,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x80_0002, - link: 0x0, + continued: 0, length: 4) if args.src.available() < 4 { return "#internal error: inconsistent I/O" @@ -1339,7 +1339,7 @@ pri func decoder.decode_leading?(dst: base.token_writer, src: base.io_reader) { this.allow_leading_ars = false args.src.skip32_fast!(actual: 1, worst_case: 1) args.dst.write_simple_token_fast!( - value_major: 0, value_minor: 0, link: 0x0, length: 1) + value_major: 0, value_minor: 0, continued: 0, length: 1) continue } else if (c == 0xEF) and this.allow_leading_ubom { if args.src.available() < 3 { @@ -1354,7 +1354,7 @@ pri func decoder.decode_leading?(dst: base.token_writer, src: base.io_reader) { this.allow_leading_ubom = false args.src.skip32_fast!(actual: 3, worst_case: 3) args.dst.write_simple_token_fast!( - value_major: 0, value_minor: 0, link: 0x0, length: 3) + value_major: 0, value_minor: 0, continued: 0, length: 3) continue } } @@ -1363,10 +1363,9 @@ pri func decoder.decode_leading?(dst: base.token_writer, src: base.io_reader) { } pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) { - var c : base.u8 - var c2 : base.u16 - var link_prev : base.u32[..= 0x2] - var length : base.u32[..= 0xFFFD] + var c : base.u8 + var c2 : base.u16 + var length : base.u32[..= 0xFFFD] while (args.dst.available() <= 0) or (args.src.available() <= 1), post args.dst.available() > 0, @@ -1402,9 +1401,8 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x2, - link: 0x1 | link_prev, + continued: 1, length: length) - link_prev = 0x2 } if args.src.is_closed() { return "#bad input" @@ -1420,7 +1418,7 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x2, - link: link_prev, + continued: 0, length: length + 2) return ok } @@ -1430,10 +1428,9 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x2, - link: 0x1 | link_prev, + continued: 1, length: length + 1) length = 0 - link_prev = 0x2 continue.comment_block } length += 1 @@ -1459,9 +1456,8 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x1, - link: 0x1 | link_prev, + continued: 1, length: length) - link_prev = 0x2 } if args.src.is_closed() { return "#bad input" @@ -1477,7 +1473,7 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x1, - link: link_prev, + continued: 0, length: length + 1) return ok } @@ -1487,10 +1483,9 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0x1, - link: 0x1 | link_prev, + continued: 1, length: length + 1) length = 0 - link_prev = 0x2 continue.comment_line } length += 1 @@ -1527,7 +1522,7 @@ pri func decoder.decode_inf_nan?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0xA0_0020, - link: 0x0, + continued: 0, length: 8) args.src.skip32_fast!(actual: 8, worst_case: 8) return ok @@ -1539,7 +1534,7 @@ pri func decoder.decode_inf_nan?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0xA0_0020, - link: 0x0, + continued: 0, length: 3) args.src.skip32_fast!(actual: 3, worst_case: 3) return ok @@ -1548,7 +1543,7 @@ pri func decoder.decode_inf_nan?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0xA0_0080, - link: 0x0, + continued: 0, length: 3) args.src.skip32_fast!(actual: 3, worst_case: 3) return ok @@ -1575,7 +1570,7 @@ pri func decoder.decode_inf_nan?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0xA0_0000 | ((0x20 as base.u32) >> neg), - link: 0x0, + continued: 0, length: 9) args.src.skip32_fast!(actual: 9, worst_case: 9) return ok @@ -1587,7 +1582,7 @@ pri func decoder.decode_inf_nan?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0xA0_0000 | ((0x20 as base.u32) >> neg), - link: 0x0, + continued: 0, length: 4) args.src.skip32_fast!(actual: 4, worst_case: 4) return ok @@ -1596,7 +1591,7 @@ pri func decoder.decode_inf_nan?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: 0xA0_0000 | ((0x80 as base.u32) >> neg), - link: 0x0, + continued: 0, length: 4) args.src.skip32_fast!(actual: 4, worst_case: 4) return ok @@ -1623,7 +1618,7 @@ pri func decoder.decode_trailing_new_line?(dst: base.token_writer, src: base.io_ if args.src.available() <= 0 { if whitespace_length > 0 { args.dst.write_simple_token_fast!( - value_major: 0, value_minor: 0, link: 0x0, length: whitespace_length) + value_major: 0, value_minor: 0, continued: 0, length: whitespace_length) whitespace_length = 0 } if args.src.is_closed() { @@ -1638,7 +1633,7 @@ pri func decoder.decode_trailing_new_line?(dst: base.token_writer, src: base.io_ if lut_classes[c] <> 0x00 { // 0x00 is CLASS_WHITESPACE. if whitespace_length > 0 { args.dst.write_simple_token_fast!( - value_major: 0, value_minor: 0, link: 0x0, length: whitespace_length) + value_major: 0, value_minor: 0, continued: 0, length: whitespace_length) whitespace_length = 0 } return "#bad input" @@ -1647,7 +1642,7 @@ pri func decoder.decode_trailing_new_line?(dst: base.token_writer, src: base.io_ args.src.skip32_fast!(actual: 1, worst_case: 1) if (whitespace_length >= 0xFFFE) or (c == '\n') { args.dst.write_simple_token_fast!( - value_major: 0, value_minor: 0, link: 0x0, length: whitespace_length + 1) + value_major: 0, value_minor: 0, continued: 0, length: whitespace_length + 1) whitespace_length = 0 if c == '\n' { break.outer diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index 8b82fb95..657e44a5 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -1136,8 +1136,7 @@ do_test__wuffs_base__token_decoder(wuffs_base__token_decoder* b, uint16_t len = wuffs_base__token__length(t); if (wuffs_base__token__value(t) != 0) { - uint8_t lp = wuffs_base__token__link_prev(t) ? 1 : 0; - uint8_t ln = wuffs_base__token__link_next(t) ? 1 : 0; + uint16_t con = wuffs_base__token__continued(t) ? 1 : 0; int32_t vmajor = wuffs_base__token__value_major(t); if ((have.data.len - have.meta.wi) < 16) { @@ -1149,8 +1148,7 @@ do_test__wuffs_base__token_decoder(wuffs_base__token_decoder* b, wuffs_base__store_u32be__no_bounds_check(ptr + 0x0, (uint32_t)(pos)); wuffs_base__store_u16be__no_bounds_check(ptr + 0x4, len); - wuffs_base__store_u8__no_bounds_check(ptr + 0x0006, lp); - wuffs_base__store_u8__no_bounds_check(ptr + 0x0007, ln); + wuffs_base__store_u16be__no_bounds_check(ptr + 0x6, con); if (vmajor > 0) { wuffs_base__store_u32be__no_bounds_check(ptr + 0x8, vmajor); uint32_t vminor = wuffs_base__token__value_minor(t); diff --git a/test/data/australian-abc-local-stations.tokens b/test/data/australian-abc-local-stations.tokens index 4274df83bc4ee3bbc3567ec99f70c3ac49d7c4e0..1750ef5497bec94fe46f00052d50773f0f0b3e63 100644 GIT binary patch literal 67792 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�vUJ%k?5I{~JLTLSS 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 CEFIYZ diff --git a/test/data/json-quirks.tokens b/test/data/json-quirks.tokens index d8feab9d72b3bdf76d7d1659794384e556cf1e0b..d2518f2169afa809889aea804d82d2a8c01ae4bc 100644 GIT binary patch literal 960 zcmZQzU|?ZjWB>z31_eO|1_pKpW-yn5m4OAs;zjTo8WHXyki)Hz`05M{3^qu7B?bltJ0!k60|SEt5z31_eO|1_pKpW-yn5m4OAs;zjTo8WH61{Vf)i2tDe^=5!@8KB|e4+$Lx21W)4PejhgwM>t zJcWUQA(nv=!iUPop_!k^pat?47=yyS7tQ=WH1j7ia6!ytX8f{}fq`K*n)!3k%%9I7 z3pN`>FflMN>}SvcF~Jzbe}`t@do=q#A^h|IF9QR^4>bFJqS^O{K^$y0h+t%3U=&3) zpHU3ed`3yQe;7dKGb*E+&!~cGKBGDVD3yau2So`3qa`AK6r30s7;Vw)vqLk_9w~h{ sFfcH>qse=q+2@01o-dmF17P}@A?^=k;Dp2vB)%D=(9DZPxK}_40GX5}OaK4? diff --git a/test/data/json-things.unformatted.tokens b/test/data/json-things.unformatted.tokens index 8fa0137965f3be5e3c2aaf658b8c5b28bb2dbf73..7bab270e5eeb908fcd62cfcedcaa9a901e22b1d7 100644 GIT binary patch delta 199 zcmaFB{D66anjixs0|NsC69a=H0|NsK10%yk^L|u8X^`M`eMN{$W(J0A1_lO01~wSq zuZMww!JL7SVX``-KB`t{kZ3xid=yMA11AFmgC_$MoFBu$z~GI<=VD-B@I{!-0OAKj TRD)e9%)r190^>6>2si-%r6LV4 delta 199 zcmaFB{D66anjj-10|NsC69a=H0|NsK10&-^^L|u8X^`M`eMN{$W(J0A1_lO01~wSq zuZMww!JL7Sak4t2KB`t{kZ3xid=yMA11AFmgC_$MoFBu$z~GI<=VD-B@I{!-0OAKT XK$L@ADa^pY5W)a