diff --git a/internal/cgen/base/token-public.h b/internal/cgen/base/token-public.h index 5028873f..9a86e1de 100644 --- a/internal/cgen/base/token-public.h +++ b/internal/cgen/base/token-public.h @@ -16,21 +16,35 @@ // ---------------- Tokens -#define WUFFS_BASE__TOKEN__LENGTH_MASK 0xFFFF -#define WUFFS_BASE__TOKEN__MINOR_VALUE_MASK 0xFFFFFF -#define WUFFS_BASE__TOKEN__MAJOR_VALUE_MASK 0xFFFFFF -#define WUFFS_BASE__TOKEN__VALUE_MASK 0xFFFFFFFFFFFF +#define WUFFS_BASE__TOKEN__VALUE__MASK 0xFFFFFFFFFFFF +#define WUFFS_BASE__TOKEN__VALUE_MAJOR__MASK 0xFFFFFF +#define WUFFS_BASE__TOKEN__VALUE_MINOR__MASK 0xFFFFFF +#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__MASK 0x7FFFFFF +#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__MASK 0x1FFFFF +#define WUFFS_BASE__TOKEN__LENGTH__MASK 0xFFFF -#define WUFFS_BASE__TOKEN__LENGTH_SHIFT 0 -#define WUFFS_BASE__TOKEN__MINOR_VALUE_SHIFT 16 -#define WUFFS_BASE__TOKEN__MAJOR_VALUE_SHIFT 40 -#define WUFFS_BASE__TOKEN__VALUE_SHIFT 16 +#define WUFFS_BASE__TOKEN__VALUE__SHIFT 16 +#define WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT 40 +#define WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT 16 +#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT 37 +#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT 16 +#define WUFFS_BASE__TOKEN__LENGTH__SHIFT 0 typedef struct { // Bits 63 .. 40 (24 bits) is the major value. // Bits 39 .. 16 (24 bits) is the minor value. // Bits 15 .. 0 (16 bits) is the length. uint64_t repr; + +#ifdef __cplusplus + inline uint64_t value() const; + inline uint64_t value_major() const; + inline uint64_t value_minor() const; + inline uint64_t value_base_category() const; + inline uint64_t value_base_detail() const; + inline uint64_t length() const; +#endif // __cplusplus + } wuffs_base__token; static inline wuffs_base__token // @@ -40,6 +54,78 @@ wuffs_base__make_token(uint64_t repr) { return ret; } +static inline uint64_t // +wuffs_base__token__value(const wuffs_base__token* t) { + return (t->repr >> WUFFS_BASE__TOKEN__VALUE__SHIFT) & + WUFFS_BASE__TOKEN__VALUE__MASK; +} + +static inline uint64_t // +wuffs_base__token__value_major(const wuffs_base__token* t) { + return (t->repr >> WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) & + WUFFS_BASE__TOKEN__VALUE_MAJOR__MASK; +} + +static inline uint64_t // +wuffs_base__token__value_minor(const wuffs_base__token* t) { + return (t->repr >> WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) & + WUFFS_BASE__TOKEN__VALUE_MINOR__MASK; +} + +static inline uint64_t // +wuffs_base__token__value_base_category(const wuffs_base__token* t) { + return (t->repr >> WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT) & + WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__MASK; +} + +static inline uint64_t // +wuffs_base__token__value_base_detail(const wuffs_base__token* t) { + return (t->repr >> WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT) & + WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__MASK; +} + +static inline uint64_t // +wuffs_base__token__length(const wuffs_base__token* t) { + return (t->repr >> WUFFS_BASE__TOKEN__LENGTH__SHIFT) & + WUFFS_BASE__TOKEN__LENGTH__MASK; +} + +#ifdef __cplusplus + +inline uint64_t // +wuffs_base__token::value() const { + return wuffs_base__token__value(this); +} + +inline uint64_t // +wuffs_base__token::value_major() const { + return wuffs_base__token__value_major(this); +} + +inline uint64_t // +wuffs_base__token::value_minor() const { + return wuffs_base__token__value_minor(this); +} + +inline uint64_t // +wuffs_base__token::value_base_category() const { + return wuffs_base__token__value_base_category(this); +} + +inline uint64_t // +wuffs_base__token::value_base_detail() const { + return wuffs_base__token__value_base_detail(this); +} + +inline uint64_t // +wuffs_base__token::length() const { + return wuffs_base__token__length(this); +} + +#endif // __cplusplus + +// -------- + typedef WUFFS_BASE__SLICE(wuffs_base__token) wuffs_base__slice_token; static inline wuffs_base__slice_token // @@ -50,6 +136,8 @@ wuffs_base__make_slice_token(wuffs_base__token* ptr, size_t len) { return ret; } +// -------- + // wuffs_base__token_buffer_meta is the metadata for a // wuffs_base__token_buffer's data. typedef struct { diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index af01c2a3..1504bf58 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -667,11 +667,11 @@ func (g *gen) writeBuiltinQuestionCall(b *buffer, n *a.Expr, depth uint32) error if err := g.writeExpr(b, n.Args()[0].AsArg().Value(), depth); err != nil { return err } - b.writes(") << WUFFS_BASE__TOKEN__VALUE_SHIFT) | ((") + b.writes(") << WUFFS_BASE__TOKEN__VALUE__SHIFT) | ((") if err := g.writeExpr(b, n.Args()[1].AsArg().Value(), depth); err != nil { return err } - b.writes(") << WUFFS_BASE__TOKEN__LENGTH_SHIFT);\n") + b.writes(") << WUFFS_BASE__TOKEN__LENGTH__SHIFT);\n") if err := g.writeCoroSuspPoint(b, false); err != nil { return err diff --git a/internal/cgen/data.go b/internal/cgen/data.go index a9ff5ef3..a87e6739 100644 --- a/internal/cgen/data.go +++ b/internal/cgen/data.go @@ -258,11 +258,17 @@ const baseTokenPrivateH = "" + "" const baseTokenPublicH = "" + - "// ---------------- Tokens\n\n#define WUFFS_BASE__TOKEN__LENGTH_MASK 0xFFFF\n#define WUFFS_BASE__TOKEN__MINOR_VALUE_MASK 0xFFFFFF\n#define WUFFS_BASE__TOKEN__MAJOR_VALUE_MASK 0xFFFFFF\n#define WUFFS_BASE__TOKEN__VALUE_MASK 0xFFFFFFFFFFFF\n\n#define WUFFS_BASE__TOKEN__LENGTH_SHIFT 0\n#define WUFFS_BASE__TOKEN__MINOR_VALUE_SHIFT 16\n#define WUFFS_BASE__TOKEN__MAJOR_VALUE_SHIFT 40\n#define WUFFS_BASE__TOKEN__VALUE_SHIFT 16\n\ntypedef struct {\n // Bits 63 .. 40 (24 bits) is the major value.\n // Bits 39 .. 16 (24 bits) is the minor value.\n // Bits 15 .. 0 (16 bits) is the length.\n uint64_t repr;\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\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// wuffs_bas" + - "e__token_buffer_meta is the metadata for a\n// wuffs_base__token_buffer's data.\ntypedef struct {\n size_t wi; // Write index. Invariant: wi <= len.\n size_t ri; // Read index. Invariant: ri <= wi.\n uint64_t pos; // Position of the buffer start relative to the stream start.\n bool closed; // No further writes are expected.\n} wuffs_base__token_buffer_meta;\n\n// wuffs_base__token_buffer is a 1-dimensional buffer (a pointer and length)\n// plus additional metadata.\n//\n// A value with all fields zero is a valid, empty buffer.\ntypedef struct {\n wuffs_base__slice_token data;\n wuffs_base__token_buffer_meta meta;\n\n#ifdef __cplusplus\n inline void compact();\n inline uint64_t reader_available() const;\n inline uint64_t reader_token_position() const;\n inline uint64_t writer_available() const;\n inline uint64_t writer_token_position() const;\n#endif // __cplusplus\n\n} wuffs_base__token_buffer;\n\nstatic inline wuffs_base__token_buffer //\nwuffs_base__make_token_buffer(wuffs_base__slice_token data,\n " + - " wuffs_base__token_buffer_meta meta) {\n wuffs_base__token_buffer ret;\n ret.data = data;\n ret.meta = meta;\n return ret;\n}\n\nstatic inline wuffs_base__token_buffer_meta //\nwuffs_base__make_token_buffer_meta(size_t wi,\n size_t ri,\n uint64_t pos,\n bool closed) {\n wuffs_base__token_buffer_meta ret;\n ret.wi = wi;\n ret.ri = ri;\n ret.pos = pos;\n ret.closed = closed;\n return ret;\n}\n\nstatic inline wuffs_base__token_buffer //\nwuffs_base__empty_token_buffer() {\n wuffs_base__token_buffer ret;\n ret.data.ptr = NULL;\n ret.data.len = 0;\n ret.meta.wi = 0;\n ret.meta.ri = 0;\n ret.meta.pos = 0;\n ret.meta.closed = false;\n return ret;\n}\n\nstatic inline wuffs_base__token_buffer_meta //\nwuffs_base__empty_token_buffer_meta() {\n wuffs_base__token_buffer_meta ret;\n ret.wi = 0;\n ret.ri = 0;\n ret.pos = 0;\n ret.closed = false;\n return ret;\n}\n\n// wuffs_base__token_buffer__compact moves any written bu" + - "t unread tokens to the\n// start of the buffer.\nstatic inline void //\nwuffs_base__token_buffer__compact(wuffs_base__token_buffer* buf) {\n if (!buf || (buf->meta.ri == 0)) {\n return;\n }\n buf->meta.pos = wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri);\n size_t n = buf->meta.wi - buf->meta.ri;\n if (n != 0) {\n memmove(buf->data.ptr, buf->data.ptr + buf->meta.ri,\n n * sizeof(wuffs_base__token));\n }\n buf->meta.wi = n;\n buf->meta.ri = 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__token_buffer__reader_available(\n const wuffs_base__token_buffer* buf) {\n return buf ? buf->meta.wi - buf->meta.ri : 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__token_buffer__reader_token_position(\n const wuffs_base__token_buffer* buf) {\n return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri) : 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__token_buffer__writer_available(\n const wuffs_base__token_buffer* buf) {\n return buf ? buf->data.len - buf->meta.wi : 0;\n}\n\nstatic inline uint64_t //\nw" + - "uffs_base__token_buffer__writer_token_position(\n const wuffs_base__token_buffer* buf) {\n return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__token_buffer::compact() {\n wuffs_base__token_buffer__compact(this);\n}\n\ninline uint64_t //\nwuffs_base__token_buffer::reader_available() const {\n return wuffs_base__token_buffer__reader_available(this);\n}\n\ninline uint64_t //\nwuffs_base__token_buffer::reader_token_position() const {\n return wuffs_base__token_buffer__reader_token_position(this);\n}\n\ninline uint64_t //\nwuffs_base__token_buffer::writer_available() const {\n return wuffs_base__token_buffer__writer_available(this);\n}\n\ninline uint64_t //\nwuffs_base__token_buffer::writer_token_position() const {\n return wuffs_base__token_buffer__writer_token_position(this);\n}\n\n#endif // __cplusplus\n" + + "// ---------------- Tokens\n\n#define WUFFS_BASE__TOKEN__VALUE__MASK 0xFFFFFFFFFFFF\n#define WUFFS_BASE__TOKEN__VALUE_MAJOR__MASK 0xFFFFFF\n#define WUFFS_BASE__TOKEN__VALUE_MINOR__MASK 0xFFFFFF\n#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__MASK 0x7FFFFFF\n#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__MASK 0x1FFFFF\n#define WUFFS_BASE__TOKEN__LENGTH__MASK 0xFFFF\n\n#define WUFFS_BASE__TOKEN__VALUE__SHIFT 16\n#define WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT 40\n#define WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT 16\n#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT 37\n#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT 16\n#define WUFFS_BASE__TOKEN__LENGTH__SHIFT 0\n\ntypedef struct {\n // Bits 63 .. 40 (24 bits) is the major value.\n // Bits 39 .. 16 (24 bits) is the minor value.\n // Bits 15 .. 0 (16 bits) is the length.\n uint64_t repr;\n\n#ifdef __cplusplus\n inline uint64_t value() const;\n inline uint64_t value_major() const;\n inline uint64_t value_minor() const;\n inline uint64_t value_base_category() const;\n inline uin" + + "t64_t value_base_detail() 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\nstatic inline uint64_t //\nwuffs_base__token__value(const wuffs_base__token* t) {\n return (t->repr >> WUFFS_BASE__TOKEN__VALUE__SHIFT) &\n WUFFS_BASE__TOKEN__VALUE__MASK;\n}\n\nstatic inline uint64_t //\nwuffs_base__token__value_major(const wuffs_base__token* t) {\n return (t->repr >> WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) &\n WUFFS_BASE__TOKEN__VALUE_MAJOR__MASK;\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) &\n WUFFS_BASE__TOKEN__VALUE_MINOR__MASK;\n}\n\nstatic inline uint64_t //\nwuffs_base__token__value_base_category(const wuffs_base__token* t) {\n return (t->repr >> WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT) &\n WUFFS_BASE__TOKEN" + + "__VALUE_BASE_CATEGORY__MASK;\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) &\n WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__MASK;\n}\n\nstatic inline uint64_t //\nwuffs_base__token__length(const wuffs_base__token* t) {\n return (t->repr >> WUFFS_BASE__TOKEN__LENGTH__SHIFT) &\n WUFFS_BASE__TOKEN__LENGTH__MASK;\n}\n\n#ifdef __cplusplus\n\ninline uint64_t //\nwuffs_base__token::value() const {\n return wuffs_base__token__value(this);\n}\n\ninline uint64_t //\nwuffs_base__token::value_major() const {\n return wuffs_base__token__value_major(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_category() const {\n return wuffs_base__token__value_base_category(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 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" + + "" + + "// --------\n\n// wuffs_base__token_buffer_meta is the metadata for a\n// wuffs_base__token_buffer's data.\ntypedef struct {\n size_t wi; // Write index. Invariant: wi <= len.\n size_t ri; // Read index. Invariant: ri <= wi.\n uint64_t pos; // Position of the buffer start relative to the stream start.\n bool closed; // No further writes are expected.\n} wuffs_base__token_buffer_meta;\n\n// wuffs_base__token_buffer is a 1-dimensional buffer (a pointer and length)\n// plus additional metadata.\n//\n// A value with all fields zero is a valid, empty buffer.\ntypedef struct {\n wuffs_base__slice_token data;\n wuffs_base__token_buffer_meta meta;\n\n#ifdef __cplusplus\n inline void compact();\n inline uint64_t reader_available() const;\n inline uint64_t reader_token_position() const;\n inline uint64_t writer_available() const;\n inline uint64_t writer_token_position() const;\n#endif // __cplusplus\n\n} wuffs_base__token_buffer;\n\nstatic inline wuffs_base__token_buffer //\nwuffs_base__make_token_buffer(wuffs_base__slice_" + + "token data,\n wuffs_base__token_buffer_meta meta) {\n wuffs_base__token_buffer ret;\n ret.data = data;\n ret.meta = meta;\n return ret;\n}\n\nstatic inline wuffs_base__token_buffer_meta //\nwuffs_base__make_token_buffer_meta(size_t wi,\n size_t ri,\n uint64_t pos,\n bool closed) {\n wuffs_base__token_buffer_meta ret;\n ret.wi = wi;\n ret.ri = ri;\n ret.pos = pos;\n ret.closed = closed;\n return ret;\n}\n\nstatic inline wuffs_base__token_buffer //\nwuffs_base__empty_token_buffer() {\n wuffs_base__token_buffer ret;\n ret.data.ptr = NULL;\n ret.data.len = 0;\n ret.meta.wi = 0;\n ret.meta.ri = 0;\n ret.meta.pos = 0;\n ret.meta.closed = false;\n return ret;\n}\n\nstatic inline wuffs_base__token_buffer_meta //\nwuffs_base__empty_token_buffer_meta() {\n wuffs_base__token_buffer_meta ret;\n ret.wi = 0;\n ret.ri = 0;\n ret.pos = 0;\n ret.closed = false;\n return ret;\n}\n\n// wuffs_base__token_buffer__com" + + "pact moves any written but unread tokens to the\n// start of the buffer.\nstatic inline void //\nwuffs_base__token_buffer__compact(wuffs_base__token_buffer* buf) {\n if (!buf || (buf->meta.ri == 0)) {\n return;\n }\n buf->meta.pos = wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri);\n size_t n = buf->meta.wi - buf->meta.ri;\n if (n != 0) {\n memmove(buf->data.ptr, buf->data.ptr + buf->meta.ri,\n n * sizeof(wuffs_base__token));\n }\n buf->meta.wi = n;\n buf->meta.ri = 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__token_buffer__reader_available(\n const wuffs_base__token_buffer* buf) {\n return buf ? buf->meta.wi - buf->meta.ri : 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__token_buffer__reader_token_position(\n const wuffs_base__token_buffer* buf) {\n return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri) : 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__token_buffer__writer_available(\n const wuffs_base__token_buffer* buf) {\n return buf ? buf->data.len - buf->meta.wi : 0;\n}\n\nsta" + + "tic inline uint64_t //\nwuffs_base__token_buffer__writer_token_position(\n const wuffs_base__token_buffer* buf) {\n return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__token_buffer::compact() {\n wuffs_base__token_buffer__compact(this);\n}\n\ninline uint64_t //\nwuffs_base__token_buffer::reader_available() const {\n return wuffs_base__token_buffer__reader_available(this);\n}\n\ninline uint64_t //\nwuffs_base__token_buffer::reader_token_position() const {\n return wuffs_base__token_buffer__reader_token_position(this);\n}\n\ninline uint64_t //\nwuffs_base__token_buffer::writer_available() const {\n return wuffs_base__token_buffer__writer_available(this);\n}\n\ninline uint64_t //\nwuffs_base__token_buffer::writer_token_position() const {\n return wuffs_base__token_buffer__writer_token_position(this);\n}\n\n#endif // __cplusplus\n" + "" const baseCopyright = "" + diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index f552efde..85ce3b0e 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -1463,21 +1463,35 @@ wuffs_base__io_buffer::writer_io_position() const { // ---------------- Tokens -#define WUFFS_BASE__TOKEN__LENGTH_MASK 0xFFFF -#define WUFFS_BASE__TOKEN__MINOR_VALUE_MASK 0xFFFFFF -#define WUFFS_BASE__TOKEN__MAJOR_VALUE_MASK 0xFFFFFF -#define WUFFS_BASE__TOKEN__VALUE_MASK 0xFFFFFFFFFFFF +#define WUFFS_BASE__TOKEN__VALUE__MASK 0xFFFFFFFFFFFF +#define WUFFS_BASE__TOKEN__VALUE_MAJOR__MASK 0xFFFFFF +#define WUFFS_BASE__TOKEN__VALUE_MINOR__MASK 0xFFFFFF +#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__MASK 0x7FFFFFF +#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__MASK 0x1FFFFF +#define WUFFS_BASE__TOKEN__LENGTH__MASK 0xFFFF -#define WUFFS_BASE__TOKEN__LENGTH_SHIFT 0 -#define WUFFS_BASE__TOKEN__MINOR_VALUE_SHIFT 16 -#define WUFFS_BASE__TOKEN__MAJOR_VALUE_SHIFT 40 -#define WUFFS_BASE__TOKEN__VALUE_SHIFT 16 +#define WUFFS_BASE__TOKEN__VALUE__SHIFT 16 +#define WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT 40 +#define WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT 16 +#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT 37 +#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT 16 +#define WUFFS_BASE__TOKEN__LENGTH__SHIFT 0 typedef struct { // Bits 63 .. 40 (24 bits) is the major value. // Bits 39 .. 16 (24 bits) is the minor value. // Bits 15 .. 0 (16 bits) is the length. uint64_t repr; + +#ifdef __cplusplus + inline uint64_t value() const; + inline uint64_t value_major() const; + inline uint64_t value_minor() const; + inline uint64_t value_base_category() const; + inline uint64_t value_base_detail() const; + inline uint64_t length() const; +#endif // __cplusplus + } wuffs_base__token; static inline wuffs_base__token // @@ -1487,6 +1501,78 @@ wuffs_base__make_token(uint64_t repr) { return ret; } +static inline uint64_t // +wuffs_base__token__value(const wuffs_base__token* t) { + return (t->repr >> WUFFS_BASE__TOKEN__VALUE__SHIFT) & + WUFFS_BASE__TOKEN__VALUE__MASK; +} + +static inline uint64_t // +wuffs_base__token__value_major(const wuffs_base__token* t) { + return (t->repr >> WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) & + WUFFS_BASE__TOKEN__VALUE_MAJOR__MASK; +} + +static inline uint64_t // +wuffs_base__token__value_minor(const wuffs_base__token* t) { + return (t->repr >> WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) & + WUFFS_BASE__TOKEN__VALUE_MINOR__MASK; +} + +static inline uint64_t // +wuffs_base__token__value_base_category(const wuffs_base__token* t) { + return (t->repr >> WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT) & + WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__MASK; +} + +static inline uint64_t // +wuffs_base__token__value_base_detail(const wuffs_base__token* t) { + return (t->repr >> WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT) & + WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__MASK; +} + +static inline uint64_t // +wuffs_base__token__length(const wuffs_base__token* t) { + return (t->repr >> WUFFS_BASE__TOKEN__LENGTH__SHIFT) & + WUFFS_BASE__TOKEN__LENGTH__MASK; +} + +#ifdef __cplusplus + +inline uint64_t // +wuffs_base__token::value() const { + return wuffs_base__token__value(this); +} + +inline uint64_t // +wuffs_base__token::value_major() const { + return wuffs_base__token__value_major(this); +} + +inline uint64_t // +wuffs_base__token::value_minor() const { + return wuffs_base__token__value_minor(this); +} + +inline uint64_t // +wuffs_base__token::value_base_category() const { + return wuffs_base__token__value_base_category(this); +} + +inline uint64_t // +wuffs_base__token::value_base_detail() const { + return wuffs_base__token__value_base_detail(this); +} + +inline uint64_t // +wuffs_base__token::length() const { + return wuffs_base__token__length(this); +} + +#endif // __cplusplus + +// -------- + typedef WUFFS_BASE__SLICE(wuffs_base__token) wuffs_base__slice_token; static inline wuffs_base__slice_token // @@ -1497,6 +1583,8 @@ wuffs_base__make_slice_token(wuffs_base__token* ptr, size_t len) { return ret; } +// -------- + // wuffs_base__token_buffer_meta is the metadata for a // wuffs_base__token_buffer's data. typedef struct { @@ -18149,8 +18237,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, v_length = 456; self->private_data.s_decode_tokens[0].scratch = - ((123) << WUFFS_BASE__TOKEN__VALUE_SHIFT) | - ((v_length) << WUFFS_BASE__TOKEN__LENGTH_SHIFT); + ((123) << WUFFS_BASE__TOKEN__VALUE__SHIFT) | + ((v_length) << WUFFS_BASE__TOKEN__LENGTH__SHIFT); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); if (iop_a_dst == io2_a_dst) { status = wuffs_base__make_status(wuffs_base__suspension__short_write); diff --git a/test/c/std/json.c b/test/c/std/json.c index 2168e6da..79d0918c 100644 --- a/test/c/std/json.c +++ b/test/c/std/json.c @@ -87,6 +87,21 @@ const char* test_wuffs_json_decode_tokens() { CHECK_STATUS("decode_tokens", wuffs_json__decoder__decode_tokens(&dec, &got, &src)); + if (0) { + uint64_t pos = 0; + size_t i; + for (i = got.meta.ri; i < got.meta.wi; i++) { + wuffs_base__token* t = &got.data.ptr[i]; + uint64_t len = wuffs_base__token__length(t); + uint64_t bc = wuffs_base__token__value_base_category(t); + uint64_t bd = wuffs_base__token__value_base_detail(t); + printf("i=%3zu\tp=%3" PRIu64 "\tl=%3" PRIu64 "\tbc=%3" PRIu64 + "\tbd=0x%06" PRIX64 "\n", + i, pos, len, bc, bd); + pos = wuffs_base__u64__sat_add(pos, len); + } + } + return NULL; }