From 16e97281e2f06058b16314365937354a9ff1dd14 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 12 Jan 2019 10:29:41 +1100 Subject: [PATCH] Rename some decode methods to decode_io_writer --- doc/changelog.md | 2 +- example/library/library.c | 3 +- example/zcat/zcat.c | 6 +- fuzz/c/std/zlib_fuzzer.c | 3 +- release/c/wuffs-unsupported-snapshot.c | 183 +++++++++++++------------ std/deflate/decode_deflate.wuffs | 2 +- std/gif/decode_gif.wuffs | 2 +- std/gzip/decode_gzip.wuffs | 4 +- std/lzw/decode_lzw.wuffs | 2 +- std/zlib/decode_zlib.wuffs | 4 +- test/c/std/deflate.c | 9 +- test/c/std/gzip.c | 5 +- test/c/std/lzw.c | 14 +- test/c/std/zlib.c | 5 +- 14 files changed, 130 insertions(+), 114 deletions(-) diff --git a/doc/changelog.md b/doc/changelog.md index 567a4459..2b1922f3 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -27,6 +27,7 @@ - Renamed `buf1`, `reader1`, etc to `io_buffer`, `io_reader`, etc. - Renamed `u32`, `io_reader`, etc to `base.u32`, `base.io_reader`, etc. - Renamed `unread_u8?` to `undo_byte!`; added `can_undo_byte`. +- Renamed some `decode?` methods to `decode_io_writer?`. - Replaced `= try foo` with `=? foo`. - Prohibited effect-ful subexpressions. - Redesigned iterate blocks. @@ -37,7 +38,6 @@ - Added I/O positions. - Tweaked how marks and limits work. - Supported animated (not just single frame) and interlaced GIFs. -- Marked the `std/gif` LZW decoder as private. - Marked some internal status codes as private. - Removed closed-for-read/write built-in status codes. - Changed the string messages for built-in status codes. diff --git a/example/library/library.c b/example/library/library.c index 66917ff9..29fbd264 100644 --- a/example/library/library.c +++ b/example/library/library.c @@ -87,7 +87,8 @@ static const char* decode() { free(dec); return status; } - status = wuffs_deflate__decoder__decode(dec, dst_writer, src_reader); + status = + wuffs_deflate__decoder__decode_io_writer(dec, dst_writer, src_reader); if (status) { free(dec); return status; diff --git a/example/zcat/zcat.c b/example/zcat/zcat.c index ed7ff50d..e4ebf4e3 100644 --- a/example/zcat/zcat.c +++ b/example/zcat/zcat.c @@ -110,9 +110,9 @@ static const char* decode() { } while (true) { - status = - wuffs_gzip__decoder__decode(&dec, wuffs_base__io_buffer__writer(&dst), - wuffs_base__io_buffer__reader(&src)); + status = wuffs_gzip__decoder__decode_io_writer( + &dec, wuffs_base__io_buffer__writer(&dst), + wuffs_base__io_buffer__reader(&src)); if (dst.meta.wi) { // TODO: handle EINTR and other write errors; see "man 2 write". diff --git a/fuzz/c/std/zlib_fuzzer.c b/fuzz/c/std/zlib_fuzzer.c index 9e218ebd..49f58a19 100644 --- a/fuzz/c/std/zlib_fuzzer.c +++ b/fuzz/c/std/zlib_fuzzer.c @@ -71,7 +71,8 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) { while (true) { dst.meta.wi = 0; - status = wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader); + status = + wuffs_zlib__decoder__decode_io_writer(&dec, dst_writer, src_reader); if (status != wuffs_base__suspension__short_write) { break; } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 17e674cb..ebe6ac8b 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -2458,9 +2458,9 @@ sizeof__wuffs_deflate__decoder(); // ---------------- Public Function Prototypes WUFFS_BASE__MAYBE_STATIC wuffs_base__status // -wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self, - wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src); +wuffs_deflate__decoder__decode_io_writer(wuffs_deflate__decoder* self, + wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src); // ---------------- Struct Definitions @@ -2493,7 +2493,7 @@ struct wuffs_deflate__decoder__struct { struct { uint32_t coro_susp_point; - } c_decode[1]; + } c_decode_io_writer[1]; struct { uint32_t coro_susp_point; uint32_t v_final; @@ -2543,8 +2543,8 @@ struct wuffs_deflate__decoder__struct { } inline wuffs_base__status // - decode(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) { - return wuffs_deflate__decoder__decode(this, a_dst, a_src); + decode_io_writer(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) { + return wuffs_deflate__decoder__decode_io_writer(this, a_dst, a_src); } #endif // __cplusplus @@ -2592,9 +2592,9 @@ WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self, uint32_t a_lw); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // -wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self, - wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src); +wuffs_lzw__decoder__decode_io_writer(wuffs_lzw__decoder* self, + wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src); WUFFS_BASE__MAYBE_STATIC wuffs_base__slice_u8 // wuffs_lzw__decoder__flush(wuffs_lzw__decoder* self); @@ -2638,7 +2638,7 @@ struct wuffs_lzw__decoder__struct { struct { uint32_t coro_susp_point; - } c_decode[1]; + } c_decode_io_writer[1]; struct { uint32_t coro_susp_point; } c_write_to[1]; @@ -2658,8 +2658,8 @@ struct wuffs_lzw__decoder__struct { } inline wuffs_base__status // - decode(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) { - return wuffs_lzw__decoder__decode(this, a_dst, a_src); + decode_io_writer(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) { + return wuffs_lzw__decoder__decode_io_writer(this, a_dst, a_src); } inline wuffs_base__slice_u8 // @@ -2977,9 +2977,9 @@ WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_gzip__decoder__set_ignore_checksum(wuffs_gzip__decoder* self, bool a_ic); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // -wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, - wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src); +wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, + wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src); // ---------------- Struct Definitions @@ -3012,7 +3012,7 @@ struct wuffs_gzip__decoder__struct { uint32_t v_decoded_length_got; uint32_t v_checksum_want; uint64_t scratch; - } c_decode[1]; + } c_decode_io_writer[1]; } private_impl; #ifdef __cplusplus @@ -3029,8 +3029,8 @@ struct wuffs_gzip__decoder__struct { } inline wuffs_base__status // - decode(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) { - return wuffs_gzip__decoder__decode(this, a_dst, a_src); + decode_io_writer(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) { + return wuffs_gzip__decoder__decode_io_writer(this, a_dst, a_src); } #endif // __cplusplus @@ -3081,9 +3081,9 @@ WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, bool a_ic); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // -wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, - wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src); +wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, + wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src); // ---------------- Struct Definitions @@ -3113,7 +3113,7 @@ struct wuffs_zlib__decoder__struct { uint32_t coro_susp_point; uint32_t v_checksum_got; uint64_t scratch; - } c_decode[1]; + } c_decode_io_writer[1]; } private_impl; #ifdef __cplusplus @@ -3130,8 +3130,8 @@ struct wuffs_zlib__decoder__struct { } inline wuffs_base__status // - decode(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) { - return wuffs_zlib__decoder__decode(this, a_dst, a_src); + decode_io_writer(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) { + return wuffs_zlib__decoder__decode_io_writer(this, a_dst, a_src); } #endif // __cplusplus @@ -5297,12 +5297,12 @@ sizeof__wuffs_deflate__decoder() { // ---------------- Function Implementations -// -------- func deflate.decoder.decode +// -------- func deflate.decoder.decode_io_writer WUFFS_BASE__MAYBE_STATIC wuffs_base__status // -wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self, - wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src) { +wuffs_deflate__decoder__decode_io_writer(wuffs_deflate__decoder* self, + wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src) { if (!self) { return wuffs_base__error__bad_receiver; } @@ -5338,7 +5338,8 @@ wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self, io1_a_dst = a_dst.private_impl.limit; } - uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; + uint32_t coro_susp_point = + self->private_impl.c_decode_io_writer[0].coro_susp_point; if (coro_susp_point) { } switch (coro_susp_point) { @@ -5417,13 +5418,13 @@ wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self, goto ok; ok: - self->private_impl.c_decode[0].coro_susp_point = 0; + self->private_impl.c_decode_io_writer[0].coro_susp_point = 0; goto exit; } goto suspend; suspend: - self->private_impl.c_decode[0].coro_susp_point = coro_susp_point; + self->private_impl.c_decode_io_writer[0].coro_susp_point = coro_susp_point; goto exit; exit: @@ -7086,12 +7087,12 @@ wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self, uint32_t a_lw) { return ((wuffs_base__empty_struct){}); } -// -------- func lzw.decoder.decode +// -------- func lzw.decoder.decode_io_writer WUFFS_BASE__MAYBE_STATIC wuffs_base__status // -wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self, - wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src) { +wuffs_lzw__decoder__decode_io_writer(wuffs_lzw__decoder* self, + wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src) { if (!self) { return wuffs_base__error__bad_receiver; } @@ -7104,7 +7105,8 @@ wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self, uint32_t v_i = 0; - uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; + uint32_t coro_susp_point = + self->private_impl.c_decode_io_writer[0].coro_susp_point; if (coro_susp_point) { } switch (coro_susp_point) { @@ -7159,13 +7161,13 @@ wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self, goto ok; ok: - self->private_impl.c_decode[0].coro_susp_point = 0; + self->private_impl.c_decode_io_writer[0].coro_susp_point = 0; goto exit; } goto suspend; suspend: - self->private_impl.c_decode[0].coro_susp_point = coro_susp_point; + self->private_impl.c_decode_io_writer[0].coro_susp_point = coro_susp_point; goto exit; exit: @@ -9518,7 +9520,7 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, self->private_impl.f_compressed_wi)); { u_r.meta.ri = iop_v_r - u_r.data.ptr; - wuffs_base__status t_1 = wuffs_lzw__decoder__decode( + wuffs_base__status t_1 = wuffs_lzw__decoder__decode_io_writer( &self->private_impl.f_lzw, wuffs_base__utility__null_io_writer(&self->private_impl.f_util), v_r); @@ -9801,12 +9803,12 @@ wuffs_gzip__decoder__set_ignore_checksum(wuffs_gzip__decoder* self, bool a_ic) { return ((wuffs_base__empty_struct){}); } -// -------- func gzip.decoder.decode +// -------- func gzip.decoder.decode_io_writer WUFFS_BASE__MAYBE_STATIC wuffs_base__status // -wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, - wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src) { +wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, + wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src) { if (!self) { return wuffs_base__error__bad_receiver; } @@ -9862,12 +9864,14 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, io1_a_src = a_src.private_impl.limit; } - uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; + uint32_t coro_susp_point = + self->private_impl.c_decode_io_writer[0].coro_susp_point; if (coro_susp_point) { - v_flags = self->private_impl.c_decode[0].v_flags; - v_checksum_got = self->private_impl.c_decode[0].v_checksum_got; - v_decoded_length_got = self->private_impl.c_decode[0].v_decoded_length_got; - v_checksum_want = self->private_impl.c_decode[0].v_checksum_want; + v_flags = self->private_impl.c_decode_io_writer[0].v_flags; + v_checksum_got = self->private_impl.c_decode_io_writer[0].v_checksum_got; + v_decoded_length_got = + self->private_impl.c_decode_io_writer[0].v_decoded_length_got; + v_checksum_want = self->private_impl.c_decode_io_writer[0].v_checksum_want; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -9920,16 +9924,16 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, uint8_t t_3 = *iop_a_src++; v_flags = t_3; } - self->private_impl.c_decode[0].scratch = 6; + self->private_impl.c_decode_io_writer[0].scratch = 6; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); - if (self->private_impl.c_decode[0].scratch > + if (self->private_impl.c_decode_io_writer[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.c_decode[0].scratch -= io1_a_src - iop_a_src; + self->private_impl.c_decode_io_writer[0].scratch -= io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.c_decode[0].scratch; + iop_a_src += self->private_impl.c_decode_io_writer[0].scratch; if ((v_flags & 4) != 0) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); @@ -9938,14 +9942,15 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, t_4 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { - self->private_impl.c_decode[0].scratch = 0; + self->private_impl.c_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.c_decode[0].scratch; + uint64_t* scratch = + &self->private_impl.c_decode_io_writer[0].scratch; uint32_t num_bits_4 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -9960,16 +9965,17 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, } v_xlen = t_4; } - self->private_impl.c_decode[0].scratch = ((uint32_t)(v_xlen)); + self->private_impl.c_decode_io_writer[0].scratch = ((uint32_t)(v_xlen)); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); - if (self->private_impl.c_decode[0].scratch > + if (self->private_impl.c_decode_io_writer[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.c_decode[0].scratch -= io1_a_src - iop_a_src; + self->private_impl.c_decode_io_writer[0].scratch -= + io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.c_decode[0].scratch; + iop_a_src += self->private_impl.c_decode_io_writer[0].scratch; } if ((v_flags & 8) != 0) { while (true) { @@ -10006,16 +10012,17 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, label_1_break:; } if ((v_flags & 2) != 0) { - self->private_impl.c_decode[0].scratch = 2; + self->private_impl.c_decode_io_writer[0].scratch = 2; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11); - if (self->private_impl.c_decode[0].scratch > + if (self->private_impl.c_decode_io_writer[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.c_decode[0].scratch -= io1_a_src - iop_a_src; + self->private_impl.c_decode_io_writer[0].scratch -= + io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.c_decode[0].scratch; + iop_a_src += self->private_impl.c_decode_io_writer[0].scratch; } if ((v_flags & 224) != 0) { status = wuffs_gzip__error__bad_encoding_flags; @@ -10032,7 +10039,7 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; } - wuffs_base__status t_7 = wuffs_deflate__decoder__decode( + wuffs_base__status t_7 = wuffs_deflate__decoder__decode_io_writer( &self->private_impl.f_flate, a_dst, a_src); if (a_dst.private_impl.buf) { iop_a_dst = a_dst.private_impl.buf->data.ptr + @@ -10068,14 +10075,14 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, t_8 = wuffs_base__load_u32le(iop_a_src); iop_a_src += 4; } else { - self->private_impl.c_decode[0].scratch = 0; + self->private_impl.c_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.c_decode[0].scratch; + uint64_t* scratch = &self->private_impl.c_decode_io_writer[0].scratch; uint32_t num_bits_8 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -10097,14 +10104,14 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, t_9 = wuffs_base__load_u32le(iop_a_src); iop_a_src += 4; } else { - self->private_impl.c_decode[0].scratch = 0; + self->private_impl.c_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.c_decode[0].scratch; + uint64_t* scratch = &self->private_impl.c_decode_io_writer[0].scratch; uint32_t num_bits_9 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -10128,17 +10135,18 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, goto ok; ok: - self->private_impl.c_decode[0].coro_susp_point = 0; + self->private_impl.c_decode_io_writer[0].coro_susp_point = 0; goto exit; } goto suspend; suspend: - self->private_impl.c_decode[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode[0].v_flags = v_flags; - self->private_impl.c_decode[0].v_checksum_got = v_checksum_got; - self->private_impl.c_decode[0].v_decoded_length_got = v_decoded_length_got; - self->private_impl.c_decode[0].v_checksum_want = v_checksum_want; + self->private_impl.c_decode_io_writer[0].coro_susp_point = coro_susp_point; + self->private_impl.c_decode_io_writer[0].v_flags = v_flags; + self->private_impl.c_decode_io_writer[0].v_checksum_got = v_checksum_got; + self->private_impl.c_decode_io_writer[0].v_decoded_length_got = + v_decoded_length_got; + self->private_impl.c_decode_io_writer[0].v_checksum_want = v_checksum_want; goto exit; exit: @@ -10240,12 +10248,12 @@ wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, bool a_ic) { return ((wuffs_base__empty_struct){}); } -// -------- func zlib.decoder.decode +// -------- func zlib.decoder.decode_io_writer WUFFS_BASE__MAYBE_STATIC wuffs_base__status // -wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, - wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src) { +wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, + wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src) { if (!self) { return wuffs_base__error__bad_receiver; } @@ -10297,9 +10305,10 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, io1_a_src = a_src.private_impl.limit; } - uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; + uint32_t coro_susp_point = + self->private_impl.c_decode_io_writer[0].coro_susp_point; if (coro_susp_point) { - v_checksum_got = self->private_impl.c_decode[0].v_checksum_got; + v_checksum_got = self->private_impl.c_decode_io_writer[0].v_checksum_got; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -10311,14 +10320,14 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, t_0 = wuffs_base__load_u16be(iop_a_src); iop_a_src += 2; } else { - self->private_impl.c_decode[0].scratch = 0; + self->private_impl.c_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.c_decode[0].scratch; + uint64_t* scratch = &self->private_impl.c_decode_io_writer[0].scratch; uint32_t num_bits_0 = *scratch & 0xFF; *scratch >>= 8; *scratch <<= 8; @@ -10360,7 +10369,7 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; } - wuffs_base__status t_1 = wuffs_deflate__decoder__decode( + wuffs_base__status t_1 = wuffs_deflate__decoder__decode_io_writer( &self->private_impl.f_flate, a_dst, a_src); if (a_dst.private_impl.buf) { iop_a_dst = a_dst.private_impl.buf->data.ptr + @@ -10394,14 +10403,14 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, t_2 = wuffs_base__load_u32be(iop_a_src); iop_a_src += 4; } else { - self->private_impl.c_decode[0].scratch = 0; + self->private_impl.c_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.c_decode[0].scratch; + uint64_t* scratch = &self->private_impl.c_decode_io_writer[0].scratch; uint32_t num_bits_2 = *scratch & 0xFF; *scratch >>= 8; *scratch <<= 8; @@ -10424,14 +10433,14 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, goto ok; ok: - self->private_impl.c_decode[0].coro_susp_point = 0; + self->private_impl.c_decode_io_writer[0].coro_susp_point = 0; goto exit; } goto suspend; suspend: - self->private_impl.c_decode[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode[0].v_checksum_got = v_checksum_got; + self->private_impl.c_decode_io_writer[0].coro_susp_point = coro_susp_point; + self->private_impl.c_decode_io_writer[0].v_checksum_got = v_checksum_got; goto exit; exit: diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index b99e95f5..b383f7c4 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -121,7 +121,7 @@ pub struct decoder?( end_of_block base.bool, ) -pub func decoder.decode?(dst base.io_writer, src base.io_reader) { +pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) { var status base.status var written slice base.u8 var n_copied base.u64 diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index f663dafb..bb41c97b 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -718,7 +718,7 @@ pri func decoder.decode_id_part2?(dst ptr base.pixel_buffer, src base.io_reader, return "?internal error: inconsistent ri/wi" } io_bind (io:r, data:this.compressed[this.compressed_ri:this.compressed_wi]) { - lzw_status =? this.lzw.decode?(dst:this.util.null_io_writer(), src:r) + lzw_status =? this.lzw.decode_io_writer?(dst:this.util.null_io_writer(), src:r) this.compressed_ri ~sat+= r.since_mark().length() } diff --git a/std/gzip/decode_gzip.wuffs b/std/gzip/decode_gzip.wuffs index cc6272d7..7c44b5ca 100644 --- a/std/gzip/decode_gzip.wuffs +++ b/std/gzip/decode_gzip.wuffs @@ -30,7 +30,7 @@ pub func decoder.set_ignore_checksum!(ic base.bool) { this.ignore_checksum = args.ic } -pub func decoder.decode?(dst base.io_writer, src base.io_reader) { +pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) { var c base.u8 var flags base.u8 var xlen base.u16 @@ -100,7 +100,7 @@ pub func decoder.decode?(dst base.io_writer, src base.io_reader) { // Decode and checksum the DEFLATE-encoded payload. while true { args.dst.set_mark!() - status =? this.flate.decode?(dst:args.dst, src:args.src) + status =? this.flate.decode_io_writer?(dst:args.dst, src:args.src) if not this.ignore_checksum { checksum_got = this.checksum.update!(x:args.dst.since_mark()) decoded_length_got ~mod+= ((args.dst.since_mark().length() & 0xFFFFFFFF) as base.u32) diff --git a/std/lzw/decode_lzw.wuffs b/std/lzw/decode_lzw.wuffs index 76128c88..1543ef0d 100644 --- a/std/lzw/decode_lzw.wuffs +++ b/std/lzw/decode_lzw.wuffs @@ -58,7 +58,7 @@ pub func decoder.set_literal_width!(lw base.u32[2..8]) { this.lw = args.lw } -pub func decoder.decode?(dst base.io_writer, src base.io_reader) { +pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) { var i base.u32[..8191] // Initialize read_from state. diff --git a/std/zlib/decode_zlib.wuffs b/std/zlib/decode_zlib.wuffs index 41e912d6..f6d09e06 100644 --- a/std/zlib/decode_zlib.wuffs +++ b/std/zlib/decode_zlib.wuffs @@ -32,7 +32,7 @@ pub func decoder.set_ignore_checksum!(ic base.bool) { this.ignore_checksum = args.ic } -pub func decoder.decode?(dst base.io_writer, src base.io_reader) { +pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) { var x base.u16 var checksum_got base.u32 var status base.status @@ -55,7 +55,7 @@ pub func decoder.decode?(dst base.io_writer, src base.io_reader) { // Decode and checksum the DEFLATE-encoded payload. while true { args.dst.set_mark!() - status =? this.flate.decode?(dst:args.dst, src:args.src) + status =? this.flate.decode_io_writer?(dst:args.dst, src:args.src) if not this.ignore_checksum { checksum_got = this.checksum.update!(x:args.dst.since_mark()) } diff --git a/test/c/std/deflate.c b/test/c/std/deflate.c index 1d1c50ad..590deb5e 100644 --- a/test/c/std/deflate.c +++ b/test/c/std/deflate.c @@ -147,7 +147,8 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst, set_reader_limit(&src_reader, rlimit); } - status = wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader); + status = + wuffs_deflate__decoder__decode_io_writer(&dec, dst_writer, src_reader); if ((wlimit && (status == wuffs_base__suspension__short_write)) || (rlimit && (status == wuffs_base__suspension__short_read))) { @@ -256,13 +257,13 @@ const char* test_wuffs_deflate_decode_split_src() { src.meta.ri = gt->src_offset0; src.meta.wi = split; const char* z0 = - wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader); + wuffs_deflate__decoder__decode_io_writer(&dec, dst_writer, src_reader); src.meta.closed = true; src.meta.ri = split; src.meta.wi = gt->src_offset1; const char* z1 = - wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader); + wuffs_deflate__decoder__decode_io_writer(&dec, dst_writer, src_reader); if (z0 != wuffs_base__suspension__short_read) { RETURN_FAIL("i=%d: z0: got \"%s\", want \"%s\"", i, z0, @@ -304,7 +305,7 @@ const char* do_test_wuffs_deflate_history(int i, set_writer_limit(&dst_writer, limit); const char* got_z = - wuffs_deflate__decoder__decode(dec, dst_writer, src_reader); + wuffs_deflate__decoder__decode_io_writer(dec, dst_writer, src_reader); if (got_z != want_z) { RETURN_FAIL("i=%d: starting_history_index=0x%04" PRIX32 ": decode status: got \"%s\", want \"%s\"", diff --git a/test/c/std/gzip.c b/test/c/std/gzip.c index f3d1d764..9dfbca74 100644 --- a/test/c/std/gzip.c +++ b/test/c/std/gzip.c @@ -102,7 +102,8 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst, set_reader_limit(&src_reader, rlimit); } - status = wuffs_gzip__decoder__decode(&dec, dst_writer, src_reader); + status = + wuffs_gzip__decoder__decode_io_writer(&dec, dst_writer, src_reader); if ((wlimit && (status == wuffs_base__suspension__short_write)) || (rlimit && (status == wuffs_base__suspension__short_read))) { @@ -169,7 +170,7 @@ const char* do_test_wuffs_gzip_checksum(bool ignore_checksum, } const char* got_z = - wuffs_gzip__decoder__decode(&dec, got_writer, src_reader); + wuffs_gzip__decoder__decode_io_writer(&dec, got_writer, src_reader); if (got_z != want_z) { RETURN_FAIL("end_limit=%d: got \"%s\", want \"%s\"", end_limit, got_z, want_z); diff --git a/test/c/std/lzw.c b/test/c/std/lzw.c index af691193..9d18ffd4 100644 --- a/test/c/std/lzw.c +++ b/test/c/std/lzw.c @@ -126,7 +126,7 @@ const char* do_test_wuffs_lzw_decode(const char* src_filename, size_t old_wi = got.meta.wi; size_t old_ri = src.meta.ri; - status = wuffs_lzw__decoder__decode(&dec, got_writer, src_reader); + status = wuffs_lzw__decoder__decode_io_writer(&dec, got_writer, src_reader); if (!status) { if (src.meta.ri != src.meta.wi) { RETURN_FAIL("decode returned \"ok\" but src was not exhausted"); @@ -229,8 +229,9 @@ const char* test_wuffs_lzw_decode_output_bad() { } wuffs_lzw__decoder__set_literal_width(&dec, 7); - status = wuffs_lzw__decoder__decode(&dec, wuffs_base__io_buffer__writer(&got), - wuffs_base__io_buffer__reader(&src)); + status = wuffs_lzw__decoder__decode_io_writer( + &dec, wuffs_base__io_buffer__writer(&got), + wuffs_base__io_buffer__reader(&src)); if (status != wuffs_lzw__error__bad_code) { RETURN_FAIL("decode: \"%s\"", status); } @@ -272,8 +273,9 @@ const char* test_wuffs_lzw_decode_output_empty() { } wuffs_lzw__decoder__set_literal_width(&dec, 8); - status = wuffs_lzw__decoder__decode(&dec, wuffs_base__io_buffer__writer(&got), - wuffs_base__io_buffer__reader(&src)); + status = wuffs_lzw__decoder__decode_io_writer( + &dec, wuffs_base__io_buffer__writer(&got), + wuffs_base__io_buffer__reader(&src)); if (status) { RETURN_FAIL("decode: \"%s\"", status); } @@ -326,7 +328,7 @@ const char* do_bench_wuffs_lzw_decode(const char* filename, if (status) { RETURN_FAIL("check_wuffs_version: \"%s\"", status); } - status = wuffs_lzw__decoder__decode(&dec, got_writer, src_reader); + status = wuffs_lzw__decoder__decode_io_writer(&dec, got_writer, src_reader); if (status) { RETURN_FAIL("decode: \"%s\"", status); } diff --git a/test/c/std/zlib.c b/test/c/std/zlib.c index c6dfa3f9..252a4fea 100644 --- a/test/c/std/zlib.c +++ b/test/c/std/zlib.c @@ -102,7 +102,8 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst, set_reader_limit(&src_reader, rlimit); } - status = wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader); + status = + wuffs_zlib__decoder__decode_io_writer(&dec, dst_writer, src_reader); if ((wlimit && (status == wuffs_base__suspension__short_write)) || (rlimit && (status == wuffs_base__suspension__short_read))) { @@ -168,7 +169,7 @@ const char* do_test_wuffs_zlib_checksum(bool ignore_checksum, } const char* got_z = - wuffs_zlib__decoder__decode(&dec, got_writer, src_reader); + wuffs_zlib__decoder__decode_io_writer(&dec, got_writer, src_reader); if (got_z != want_z) { RETURN_FAIL("end_limit=%d: got \"%s\", want \"%s\"", end_limit, got_z, want_z);