From 64dbd00b0768ffa0c2c046f7094498b214ff617b Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 2 Apr 2020 22:11:42 +1100 Subject: [PATCH] Rename wuffs_base__make_etc_buffer_{read,writ}er --- internal/cgen/base/io-public.h | 28 +++++++- internal/cgen/base/token-public.h | 4 +- internal/cgen/data.go | 17 ++--- release/c/wuffs-unsupported-snapshot.c | 32 +++++++-- test/c/std/json.c | 98 ++++++++++---------------- 5 files changed, 104 insertions(+), 75 deletions(-) diff --git a/internal/cgen/base/io-public.h b/internal/cgen/base/io-public.h index 7b535cd4..6ae82aa8 100644 --- a/internal/cgen/base/io-public.h +++ b/internal/cgen/base/io-public.h @@ -69,7 +69,31 @@ wuffs_base__make_io_buffer_meta(size_t wi, } static inline wuffs_base__io_buffer // -wuffs_base__make_io_buffer_reader(wuffs_base__slice_u8 s, bool closed) { +wuffs_base__ptr_u8__reader(uint8_t* ptr, size_t len, bool closed) { + wuffs_base__io_buffer ret; + ret.data.ptr = ptr; + ret.data.len = len; + ret.meta.wi = len; + ret.meta.ri = 0; + ret.meta.pos = 0; + ret.meta.closed = closed; + return ret; +} + +static inline wuffs_base__io_buffer // +wuffs_base__ptr_u8__writer(uint8_t* ptr, size_t len) { + wuffs_base__io_buffer ret; + ret.data.ptr = ptr; + ret.data.len = len; + ret.meta.wi = 0; + ret.meta.ri = 0; + ret.meta.pos = 0; + ret.meta.closed = false; + return ret; +} + +static inline wuffs_base__io_buffer // +wuffs_base__slice_u8__reader(wuffs_base__slice_u8 s, bool closed) { wuffs_base__io_buffer ret; ret.data.ptr = s.ptr; ret.data.len = s.len; @@ -81,7 +105,7 @@ wuffs_base__make_io_buffer_reader(wuffs_base__slice_u8 s, bool closed) { } static inline wuffs_base__io_buffer // -wuffs_base__make_io_buffer_writer(wuffs_base__slice_u8 s) { +wuffs_base__slice_u8__writer(wuffs_base__slice_u8 s) { wuffs_base__io_buffer ret; ret.data.ptr = s.ptr; ret.data.len = s.len; diff --git a/internal/cgen/base/token-public.h b/internal/cgen/base/token-public.h index 2b85d7d9..14845522 100644 --- a/internal/cgen/base/token-public.h +++ b/internal/cgen/base/token-public.h @@ -365,7 +365,7 @@ wuffs_base__make_token_buffer_meta(size_t wi, } static inline wuffs_base__token_buffer // -wuffs_base__make_token_buffer_reader(wuffs_base__slice_token s, bool closed) { +wuffs_base__slice_token__reader(wuffs_base__slice_token s, bool closed) { wuffs_base__token_buffer ret; ret.data.ptr = s.ptr; ret.data.len = s.len; @@ -377,7 +377,7 @@ wuffs_base__make_token_buffer_reader(wuffs_base__slice_token s, bool closed) { } static inline wuffs_base__token_buffer // -wuffs_base__make_token_buffer_writer(wuffs_base__slice_token s) { +wuffs_base__slice_token__writer(wuffs_base__slice_token s) { wuffs_base__token_buffer ret; ret.data.ptr = s.ptr; ret.data.len = s.len; diff --git a/internal/cgen/data.go b/internal/cgen/data.go index 3e5b0bdc..0f01c489 100644 --- a/internal/cgen/data.go +++ b/internal/cgen/data.go @@ -298,10 +298,11 @@ const baseIOPrivateH = "" + const baseIOPublicH = "" + "// ---------------- I/O\n//\n// See (/doc/note/io-input-output.md).\n\n// wuffs_base__io_buffer_meta is the metadata for a wuffs_base__io_buffer's\n// 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__io_buffer_meta;\n\n// wuffs_base__io_buffer is a 1-dimensional buffer (a pointer and length) plus\n// additional metadata.\n//\n// A value with all fields zero is a valid, empty buffer.\ntypedef struct {\n wuffs_base__slice_u8 data;\n wuffs_base__io_buffer_meta meta;\n\n#ifdef __cplusplus\n inline bool is_valid() const;\n inline void compact();\n inline uint64_t reader_available() const;\n inline uint64_t reader_io_position() const;\n inline uint64_t writer_available() const;\n inline uint64_t writer_io_position() const;\n#endif // __cplusplus\n\n} wuffs_base__io_buffer;\n\nstatic inline wuffs_base__io_buf" + - "fer //\nwuffs_base__make_io_buffer(wuffs_base__slice_u8 data,\n wuffs_base__io_buffer_meta meta) {\n wuffs_base__io_buffer ret;\n ret.data = data;\n ret.meta = meta;\n return ret;\n}\n\nstatic inline wuffs_base__io_buffer_meta //\nwuffs_base__make_io_buffer_meta(size_t wi,\n size_t ri,\n uint64_t pos,\n bool closed) {\n wuffs_base__io_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__io_buffer //\nwuffs_base__make_io_buffer_reader(wuffs_base__slice_u8 s, bool closed) {\n wuffs_base__io_buffer ret;\n ret.data.ptr = s.ptr;\n ret.data.len = s.len;\n ret.meta.wi = s.len;\n ret.meta.ri = 0;\n ret.meta.pos = 0;\n ret.meta.closed = closed;\n return ret;\n}\n\nstatic inline wuffs_base__io_buffer //\nwuffs_base__make_io_buffer_writer(wuffs_base__slice_u8 s) {\n wuffs_base__io_buffer ret;\n ret.data.ptr = s.ptr;\n ret.data.len = s.le" + - "n;\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__io_buffer //\nwuffs_base__empty_io_buffer() {\n wuffs_base__io_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__io_buffer_meta //\nwuffs_base__empty_io_buffer_meta() {\n wuffs_base__io_buffer_meta ret;\n ret.wi = 0;\n ret.ri = 0;\n ret.pos = 0;\n ret.closed = false;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__io_buffer__is_valid(const wuffs_base__io_buffer* buf) {\n if (buf) {\n if (buf->data.ptr) {\n return (buf->meta.ri <= buf->meta.wi) && (buf->meta.wi <= buf->data.len);\n } else {\n return (buf->meta.ri == 0) && (buf->meta.wi == 0) && (buf->data.len == 0);\n }\n }\n return false;\n}\n\n// wuffs_base__io_buffer__compact moves any written but unread bytes to the\n// start of the buffer.\nstatic inline void //\nwuffs_base__io_buffe" + - "r__compact(wuffs_base__io_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 }\n buf->meta.wi = n;\n buf->meta.ri = 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__io_buffer__reader_available(const wuffs_base__io_buffer* buf) {\n return buf ? buf->meta.wi - buf->meta.ri : 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__io_buffer__reader_io_position(const wuffs_base__io_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__io_buffer__writer_available(const wuffs_base__io_buffer* buf) {\n return buf ? buf->data.len - buf->meta.wi : 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__io_buffer__writer_io_position(const wuffs_base__io_buffer* buf) {\n return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0;\n}\n\n#ifdef __cplusplus" + - "\n\ninline bool //\nwuffs_base__io_buffer::is_valid() const {\n return wuffs_base__io_buffer__is_valid(this);\n}\n\ninline void //\nwuffs_base__io_buffer::compact() {\n wuffs_base__io_buffer__compact(this);\n}\n\ninline uint64_t //\nwuffs_base__io_buffer::reader_available() const {\n return wuffs_base__io_buffer__reader_available(this);\n}\n\ninline uint64_t //\nwuffs_base__io_buffer::reader_io_position() const {\n return wuffs_base__io_buffer__reader_io_position(this);\n}\n\ninline uint64_t //\nwuffs_base__io_buffer::writer_available() const {\n return wuffs_base__io_buffer__writer_available(this);\n}\n\ninline uint64_t //\nwuffs_base__io_buffer::writer_io_position() const {\n return wuffs_base__io_buffer__writer_io_position(this);\n}\n\n#endif // __cplusplus\n" + + "fer //\nwuffs_base__make_io_buffer(wuffs_base__slice_u8 data,\n wuffs_base__io_buffer_meta meta) {\n wuffs_base__io_buffer ret;\n ret.data = data;\n ret.meta = meta;\n return ret;\n}\n\nstatic inline wuffs_base__io_buffer_meta //\nwuffs_base__make_io_buffer_meta(size_t wi,\n size_t ri,\n uint64_t pos,\n bool closed) {\n wuffs_base__io_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__io_buffer //\nwuffs_base__ptr_u8__reader(uint8_t* ptr, size_t len, bool closed) {\n wuffs_base__io_buffer ret;\n ret.data.ptr = ptr;\n ret.data.len = len;\n ret.meta.wi = len;\n ret.meta.ri = 0;\n ret.meta.pos = 0;\n ret.meta.closed = closed;\n return ret;\n}\n\nstatic inline wuffs_base__io_buffer //\nwuffs_base__ptr_u8__writer(uint8_t* ptr, size_t len) {\n wuffs_base__io_buffer ret;\n ret.data.ptr = ptr;\n ret.data.len = len;\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__io_buffer //\nwuffs_base__slice_u8__reader(wuffs_base__slice_u8 s, bool closed) {\n wuffs_base__io_buffer ret;\n ret.data.ptr = s.ptr;\n ret.data.len = s.len;\n ret.meta.wi = s.len;\n ret.meta.ri = 0;\n ret.meta.pos = 0;\n ret.meta.closed = closed;\n return ret;\n}\n\nstatic inline wuffs_base__io_buffer //\nwuffs_base__slice_u8__writer(wuffs_base__slice_u8 s) {\n wuffs_base__io_buffer ret;\n ret.data.ptr = s.ptr;\n ret.data.len = s.len;\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__io_buffer //\nwuffs_base__empty_io_buffer() {\n wuffs_base__io_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__io_buffer_meta //\nwuffs_base__empty_io_buffer_meta() {\n wuffs_base__io_buffer_meta ret;\n ret.wi = " + + "0;\n ret.ri = 0;\n ret.pos = 0;\n ret.closed = false;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__io_buffer__is_valid(const wuffs_base__io_buffer* buf) {\n if (buf) {\n if (buf->data.ptr) {\n return (buf->meta.ri <= buf->meta.wi) && (buf->meta.wi <= buf->data.len);\n } else {\n return (buf->meta.ri == 0) && (buf->meta.wi == 0) && (buf->data.len == 0);\n }\n }\n return false;\n}\n\n// wuffs_base__io_buffer__compact moves any written but unread bytes to the\n// start of the buffer.\nstatic inline void //\nwuffs_base__io_buffer__compact(wuffs_base__io_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 }\n buf->meta.wi = n;\n buf->meta.ri = 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__io_buffer__reader_available(const wuffs_base__io_buffer* buf) {\n return buf ? buf->meta.wi - buf->meta.ri" + + " : 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__io_buffer__reader_io_position(const wuffs_base__io_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__io_buffer__writer_available(const wuffs_base__io_buffer* buf) {\n return buf ? buf->data.len - buf->meta.wi : 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__io_buffer__writer_io_position(const wuffs_base__io_buffer* buf) {\n return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0;\n}\n\n#ifdef __cplusplus\n\ninline bool //\nwuffs_base__io_buffer::is_valid() const {\n return wuffs_base__io_buffer__is_valid(this);\n}\n\ninline void //\nwuffs_base__io_buffer::compact() {\n wuffs_base__io_buffer__compact(this);\n}\n\ninline uint64_t //\nwuffs_base__io_buffer::reader_available() const {\n return wuffs_base__io_buffer__reader_available(this);\n}\n\ninline uint64_t //\nwuffs_base__io_buffer::reader_io_position() const {\n return wuffs_base__io_buffer__reader_io_position(this);\n}\n\ninline uint" + + "64_t //\nwuffs_base__io_buffer::writer_available() const {\n return wuffs_base__io_buffer__writer_available(this);\n}\n\ninline uint64_t //\nwuffs_base__io_buffer::writer_io_position() const {\n return wuffs_base__io_buffer__writer_io_position(this);\n}\n\n#endif // __cplusplus\n" + "" const baseRangePrivateH = "" + @@ -412,10 +413,10 @@ const baseTokenPublicH = "" + "// --------\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 bool is_valid() const;\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__make_token_buffer_reader(wuffs_base__slice_token s, bool closed) {\n wuffs_base__token_buffer ret;\n ret.data.ptr = s.ptr;\n ret.data.len = s.len;\n ret.meta.wi = s.len;\n ret.meta.ri = 0;\n ret.meta.pos = 0;\n ret.meta.closed = closed;\n return ret;\n}\n\nstatic inline wuffs_base__token_buffer //\nwuffs_base__make_token_buffer_writer(wuffs_base__slice_token s) {\n wuffs_base__token_buffer ret;\n ret.data.p" + - "tr = s.ptr;\n ret.data.len = s.len;\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 //\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\nstatic inline bool //\nwuffs_base__token_buffer__is_valid(const wuffs_base__token_buffer* buf) {\n if (buf) {\n if (buf->data.ptr) {\n return (buf->meta.ri <= buf->meta.wi) && (buf->meta.wi <= buf->data.len);\n } else {\n return (buf->meta.ri == 0) && (buf->meta.wi == 0) && (buf->data.len == 0);\n }\n }\n return false;\n}\n\n// wuffs_base__token_buffer__compact moves any written but unread tokens to the\n// sta" + - "rt 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 //\nwuffs_base__token_buffer__writ" + - "er_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 bool //\nwuffs_base__token_buffer::is_valid() const {\n return wuffs_base__token_buffer__is_valid(this);\n}\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" + + "_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__slice_token__reader(wuffs_base__slice_token s, bool closed) {\n wuffs_base__token_buffer ret;\n ret.data.ptr = s.ptr;\n ret.data.len = s.len;\n ret.meta.wi = s.len;\n ret.meta.ri = 0;\n ret.meta.pos = 0;\n ret.meta.closed = closed;\n return ret;\n}\n\nstatic inline wuffs_base__token_buffer //\nwuffs_base__slice_token__writer(wuffs_base__slice_token s) {\n wuffs_base__token_buffer ret;\n ret.data.ptr = s.ptr" + + ";\n ret.data.len = s.len;\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 //\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\nstatic inline bool //\nwuffs_base__token_buffer__is_valid(const wuffs_base__token_buffer* buf) {\n if (buf) {\n if (buf->data.ptr) {\n return (buf->meta.ri <= buf->meta.wi) && (buf->meta.wi <= buf->data.len);\n } else {\n return (buf->meta.ri == 0) && (buf->meta.wi == 0) && (buf->data.len == 0);\n }\n }\n return false;\n}\n\n// wuffs_base__token_buffer__compact 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\nstatic inline uint64_t //\nwuffs_base__token_buffer__writer_token_p" + + "osition(\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 bool //\nwuffs_base__token_buffer::is_valid() const {\n return wuffs_base__token_buffer__is_valid(this);\n}\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 81e62836..c0e825a9 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -1720,7 +1720,31 @@ wuffs_base__make_io_buffer_meta(size_t wi, } static inline wuffs_base__io_buffer // -wuffs_base__make_io_buffer_reader(wuffs_base__slice_u8 s, bool closed) { +wuffs_base__ptr_u8__reader(uint8_t* ptr, size_t len, bool closed) { + wuffs_base__io_buffer ret; + ret.data.ptr = ptr; + ret.data.len = len; + ret.meta.wi = len; + ret.meta.ri = 0; + ret.meta.pos = 0; + ret.meta.closed = closed; + return ret; +} + +static inline wuffs_base__io_buffer // +wuffs_base__ptr_u8__writer(uint8_t* ptr, size_t len) { + wuffs_base__io_buffer ret; + ret.data.ptr = ptr; + ret.data.len = len; + ret.meta.wi = 0; + ret.meta.ri = 0; + ret.meta.pos = 0; + ret.meta.closed = false; + return ret; +} + +static inline wuffs_base__io_buffer // +wuffs_base__slice_u8__reader(wuffs_base__slice_u8 s, bool closed) { wuffs_base__io_buffer ret; ret.data.ptr = s.ptr; ret.data.len = s.len; @@ -1732,7 +1756,7 @@ wuffs_base__make_io_buffer_reader(wuffs_base__slice_u8 s, bool closed) { } static inline wuffs_base__io_buffer // -wuffs_base__make_io_buffer_writer(wuffs_base__slice_u8 s) { +wuffs_base__slice_u8__writer(wuffs_base__slice_u8 s) { wuffs_base__io_buffer ret; ret.data.ptr = s.ptr; ret.data.len = s.len; @@ -2198,7 +2222,7 @@ wuffs_base__make_token_buffer_meta(size_t wi, } static inline wuffs_base__token_buffer // -wuffs_base__make_token_buffer_reader(wuffs_base__slice_token s, bool closed) { +wuffs_base__slice_token__reader(wuffs_base__slice_token s, bool closed) { wuffs_base__token_buffer ret; ret.data.ptr = s.ptr; ret.data.len = s.len; @@ -2210,7 +2234,7 @@ wuffs_base__make_token_buffer_reader(wuffs_base__slice_token s, bool closed) { } static inline wuffs_base__token_buffer // -wuffs_base__make_token_buffer_writer(wuffs_base__slice_token s) { +wuffs_base__slice_token__writer(wuffs_base__slice_token s) { wuffs_base__token_buffer ret; ret.data.ptr = s.ptr; ret.data.len = s.len; diff --git a/test/c/std/json.c b/test/c/std/json.c index 36054f65..a3e520fc 100644 --- a/test/c/std/json.c +++ b/test/c/std/json.c @@ -1110,9 +1110,9 @@ test_wuffs_json_decode_end_of_data() { WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); - wuffs_base__io_buffer src = wuffs_base__make_io_buffer_reader( - wuffs_base__make_slice_u8(src_ptr, src_len), true); + wuffs_base__slice_token__writer(g_have_slice_token); + wuffs_base__io_buffer src = + wuffs_base__ptr_u8__reader(src_ptr, src_len, true); CHECK_STATUS("decode_tokens", wuffs_json__decoder__decode_tokens( &dec, &tok, &src, g_work_slice_u8)); if (src.meta.ri != 3) { @@ -1222,9 +1222,9 @@ test_wuffs_json_decode_long_numbers() { WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); + wuffs_base__slice_token__writer(g_have_slice_token); wuffs_base__io_buffer src = - wuffs_base__make_io_buffer_reader(src_data, closed != 0); + wuffs_base__slice_u8__reader(src_data, closed != 0); const char* have = wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8) .repr; @@ -1368,9 +1368,9 @@ test_wuffs_json_decode_prior_valid_utf_8() { &dec, sizeof dec, WUFFS_VERSION, 0)); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); + wuffs_base__slice_token__writer(g_have_slice_token); wuffs_base__io_buffer src = - wuffs_base__make_io_buffer_reader(src_data, closed != 0); + wuffs_base__slice_u8__reader(src_data, closed != 0); wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8); size_t have = 0; @@ -1461,11 +1461,9 @@ test_wuffs_json_decode_quirk_allow_backslash_etc() { wuffs_json__decoder__set_quirk_enabled(&dec, test_cases[tc].quirk, q); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); - wuffs_base__io_buffer src = wuffs_base__make_io_buffer_reader( - wuffs_base__make_slice_u8((void*)(test_cases[tc].str), - strlen(test_cases[tc].str)), - true); + wuffs_base__slice_token__writer(g_have_slice_token); + wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader( + (void*)test_cases[tc].str, strlen(test_cases[tc].str), true); const char* have_status_repr = wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8) @@ -1536,11 +1534,10 @@ test_wuffs_json_decode_quirk_allow_backslash_x() { &dec, WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_X, true); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); + wuffs_base__slice_token__writer(g_have_slice_token); wuffs_base__slice_u8 src_slice = wuffs_base__make_slice_u8( (void*)(test_cases[tc].str), strlen(test_cases[tc].str)); - wuffs_base__io_buffer src = - wuffs_base__make_io_buffer_reader(src_slice, true); + wuffs_base__io_buffer src = wuffs_base__slice_u8__reader(src_slice, true); const char* have_status_repr = wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8) .repr; @@ -1611,11 +1608,9 @@ test_wuffs_json_decode_quirk_allow_extra_comma() { &dec, WUFFS_JSON__QUIRK_ALLOW_EXTRA_COMMA, q & 1); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); - wuffs_base__io_buffer src = wuffs_base__make_io_buffer_reader( - wuffs_base__make_slice_u8((void*)(test_cases[tc].str), - strlen(test_cases[tc].str)), - true); + wuffs_base__slice_token__writer(g_have_slice_token); + wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader( + (void*)test_cases[tc].str, strlen(test_cases[tc].str), true); const char* have = wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8) .repr; @@ -1688,11 +1683,9 @@ test_wuffs_json_decode_quirk_allow_inf_nan_numbers() { &dec, WUFFS_JSON__QUIRK_ALLOW_INF_NAN_NUMBERS, q & 1); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); - wuffs_base__io_buffer src = wuffs_base__make_io_buffer_reader( - wuffs_base__make_slice_u8((void*)(test_cases[tc].str), - strlen(test_cases[tc].str)), - true); + wuffs_base__slice_token__writer(g_have_slice_token); + wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader( + (void*)test_cases[tc].str, strlen(test_cases[tc].str), true); const char* have = wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8) .repr; @@ -1761,11 +1754,9 @@ test_wuffs_json_decode_quirk_allow_comment_etc() { &dec, WUFFS_JSON__QUIRK_ALLOW_COMMENT_LINE, q & 2); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); - wuffs_base__io_buffer src = wuffs_base__make_io_buffer_reader( - wuffs_base__make_slice_u8((void*)(test_cases[tc].str), - strlen(test_cases[tc].str)), - true); + wuffs_base__slice_token__writer(g_have_slice_token); + wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader( + (void*)test_cases[tc].str, strlen(test_cases[tc].str), true); const char* have = wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8) .repr; @@ -1840,11 +1831,9 @@ test_wuffs_json_decode_quirk_allow_leading_etc() { &dec, WUFFS_JSON__QUIRK_ALLOW_LEADING_UNICODE_BYTE_ORDER_MARK, q & 2); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); - wuffs_base__io_buffer src = wuffs_base__make_io_buffer_reader( - wuffs_base__make_slice_u8((void*)(test_cases[tc].str), - strlen(test_cases[tc].str)), - true); + wuffs_base__slice_token__writer(g_have_slice_token); + wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader( + (void*)test_cases[tc].str, strlen(test_cases[tc].str), true); const char* have = wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8) .repr; @@ -1919,11 +1908,9 @@ test_wuffs_json_decode_quirk_allow_trailing_etc() { &dec, WUFFS_JSON__QUIRK_ALLOW_TRAILING_NEW_LINE, q & 1); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); - wuffs_base__io_buffer src = wuffs_base__make_io_buffer_reader( - wuffs_base__make_slice_u8((void*)(test_cases[tc].str), - strlen(test_cases[tc].str)), - true); + wuffs_base__slice_token__writer(g_have_slice_token); + wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader( + (void*)test_cases[tc].str, strlen(test_cases[tc].str), true); const char* have = wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8) .repr; @@ -2016,14 +2003,11 @@ test_wuffs_json_decode_quirk_replace_invalid_unicode() { wuffs_json__decoder__set_quirk_enabled( &dec, WUFFS_JSON__QUIRK_REPLACE_INVALID_UNICODE, true); - wuffs_base__io_buffer have = - wuffs_base__make_io_buffer_writer(g_have_slice_u8); + wuffs_base__io_buffer have = wuffs_base__slice_u8__writer(g_have_slice_u8); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); - wuffs_base__io_buffer src = wuffs_base__make_io_buffer_reader( - wuffs_base__make_slice_u8((void*)(test_cases[tc].str), - strlen(test_cases[tc].str)), - true); + wuffs_base__slice_token__writer(g_have_slice_token); + wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader( + (void*)test_cases[tc].str, strlen(test_cases[tc].str), true); CHECK_STATUS("decode_tokens", wuffs_json__decoder__decode_tokens( &dec, &tok, &src, g_work_slice_u8)); @@ -2153,11 +2137,9 @@ test_wuffs_json_decode_unicode4_escapes() { WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); - wuffs_base__io_buffer src = wuffs_base__make_io_buffer_reader( - wuffs_base__make_slice_u8((void*)(test_cases[tc].str), - strlen(test_cases[tc].str)), - true); + wuffs_base__slice_token__writer(g_have_slice_token); + wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader( + (void*)test_cases[tc].str, strlen(test_cases[tc].str), true); wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8); uint32_t have = fail; @@ -2242,9 +2224,9 @@ test_wuffs_json_decode_src_io_buffer_length() { int closed; for (closed = 0; closed < 2; closed++) { wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); + wuffs_base__slice_token__writer(g_have_slice_token); wuffs_base__io_buffer src = - wuffs_base__make_io_buffer_reader(src_data, closed != 0); + wuffs_base__slice_u8__reader(src_data, closed != 0); CHECK_STATUS("initialize", wuffs_json__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, @@ -2345,11 +2327,9 @@ test_wuffs_json_decode_string() { WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); wuffs_base__token_buffer tok = - wuffs_base__make_token_buffer_writer(g_have_slice_token); - wuffs_base__io_buffer src = wuffs_base__make_io_buffer_reader( - wuffs_base__make_slice_u8((void*)(test_cases[tc].str), - strlen(test_cases[tc].str)), - true); + wuffs_base__slice_token__writer(g_have_slice_token); + wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader( + (void*)test_cases[tc].str, strlen(test_cases[tc].str), true); wuffs_base__status have_status = wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8);