Have various structs implement base.io_transformer

This commit is contained in:
Nigel Tao committed 2020-01-11 22:25:31 +11:00
1 parent e9fa8d3c28
commit 92a5bfd7ec
10 files changed
+193 -4

No files matched your search

+100
View File
@@ -2959,6 +2959,12 @@ sizeof__wuffs_deflate__decoder();
// ---------------- Upcasts
static inline wuffs_base__io_transformer* //
wuffs_deflate__decoder__upcast_as__wuffs_base__io_transformer(
wuffs_deflate__decoder* p) {
return (wuffs_base__io_transformer*)p;
}
// ---------------- Public Function Prototypes
WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct //
@@ -2994,6 +3000,7 @@ struct wuffs_deflate__decoder__struct {
struct {
uint32_t magic;
uint32_t active_coroutine;
wuffs_base__vtable vtable_for__wuffs_base__io_transformer;
wuffs_base__vtable null_vtable;
uint32_t f_bits;
@@ -3088,6 +3095,11 @@ struct wuffs_deflate__decoder__struct {
wuffs_version, initialize_flags);
}
inline wuffs_base__io_transformer* //
upcast_as__wuffs_base__io_transformer() {
return (wuffs_base__io_transformer*)this;
}
inline wuffs_base__empty_struct //
add_history(wuffs_base__slice_u8 a_hist) {
return wuffs_deflate__decoder__add_history(this, a_hist);
@@ -3150,6 +3162,12 @@ sizeof__wuffs_lzw__decoder();
// ---------------- Upcasts
static inline wuffs_base__io_transformer* //
wuffs_lzw__decoder__upcast_as__wuffs_base__io_transformer(
wuffs_lzw__decoder* p) {
return (wuffs_base__io_transformer*)p;
}
// ---------------- Public Function Prototypes
WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct //
@@ -3187,6 +3205,7 @@ struct wuffs_lzw__decoder__struct {
struct {
uint32_t magic;
uint32_t active_coroutine;
wuffs_base__vtable vtable_for__wuffs_base__io_transformer;
wuffs_base__vtable null_vtable;
uint32_t f_set_literal_width_arg;
@@ -3251,6 +3270,11 @@ struct wuffs_lzw__decoder__struct {
initialize_flags);
}
inline wuffs_base__io_transformer* //
upcast_as__wuffs_base__io_transformer() {
return (wuffs_base__io_transformer*)this;
}
inline wuffs_base__empty_struct //
set_literal_width(uint32_t a_lw) {
return wuffs_lzw__decoder__set_literal_width(this, a_lw);
@@ -3697,6 +3721,12 @@ sizeof__wuffs_gzip__decoder();
// ---------------- Upcasts
static inline wuffs_base__io_transformer* //
wuffs_gzip__decoder__upcast_as__wuffs_base__io_transformer(
wuffs_gzip__decoder* p) {
return (wuffs_base__io_transformer*)p;
}
// ---------------- Public Function Prototypes
WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct //
@@ -3731,6 +3761,7 @@ struct wuffs_gzip__decoder__struct {
struct {
uint32_t magic;
uint32_t active_coroutine;
wuffs_base__vtable vtable_for__wuffs_base__io_transformer;
wuffs_base__vtable null_vtable;
bool f_ignore_checksum;
@@ -3788,6 +3819,11 @@ struct wuffs_gzip__decoder__struct {
wuffs_version, initialize_flags);
}
inline wuffs_base__io_transformer* //
upcast_as__wuffs_base__io_transformer() {
return (wuffs_base__io_transformer*)this;
}
inline wuffs_base__empty_struct //
set_ignore_checksum(bool a_ic) {
return wuffs_gzip__decoder__set_ignore_checksum(this, a_ic);
@@ -3855,6 +3891,12 @@ sizeof__wuffs_zlib__decoder();
// ---------------- Upcasts
static inline wuffs_base__io_transformer* //
wuffs_zlib__decoder__upcast_as__wuffs_base__io_transformer(
wuffs_zlib__decoder* p) {
return (wuffs_base__io_transformer*)p;
}
// ---------------- Public Function Prototypes
WUFFS_BASE__MAYBE_STATIC uint32_t //
@@ -3896,6 +3938,7 @@ struct wuffs_zlib__decoder__struct {
struct {
uint32_t magic;
uint32_t active_coroutine;
wuffs_base__vtable vtable_for__wuffs_base__io_transformer;
wuffs_base__vtable null_vtable;
bool f_bad_call_sequence;
@@ -3957,6 +4000,11 @@ struct wuffs_zlib__decoder__struct {
wuffs_version, initialize_flags);
}
inline wuffs_base__io_transformer* //
upcast_as__wuffs_base__io_transformer() {
return (wuffs_base__io_transformer*)this;
}
inline uint32_t //
dictionary_id() const {
return wuffs_zlib__decoder__dictionary_id(this);
@@ -6391,6 +6439,15 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self,
// ---------------- VTables
const wuffs_base__io_transformer__func_ptrs
wuffs_deflate__decoder__func_ptrs_for__wuffs_base__io_transformer = {
(wuffs_base__status(*)(void*,
wuffs_base__io_buffer*,
wuffs_base__io_buffer*,
wuffs_base__slice_u8))(
&wuffs_deflate__decoder__transform_io),
};
// ---------------- Initializer Implementations
wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
@@ -6434,6 +6491,10 @@ wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
self->private_impl.vtable_for__wuffs_base__io_transformer.vtable_name =
wuffs_base__io_transformer__vtable_name;
self->private_impl.vtable_for__wuffs_base__io_transformer.function_pointers =
(const void*)(&wuffs_deflate__decoder__func_ptrs_for__wuffs_base__io_transformer);
return wuffs_base__make_status(NULL);
}
@@ -8210,6 +8271,15 @@ wuffs_lzw__decoder__write_to(wuffs_lzw__decoder* self,
// ---------------- VTables
const wuffs_base__io_transformer__func_ptrs
wuffs_lzw__decoder__func_ptrs_for__wuffs_base__io_transformer = {
(wuffs_base__status(*)(void*,
wuffs_base__io_buffer*,
wuffs_base__io_buffer*,
wuffs_base__slice_u8))(
&wuffs_lzw__decoder__transform_io),
};
// ---------------- Initializer Implementations
wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
@@ -8253,6 +8323,10 @@ wuffs_lzw__decoder__initialize(wuffs_lzw__decoder* self,
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
self->private_impl.vtable_for__wuffs_base__io_transformer.vtable_name =
wuffs_base__io_transformer__vtable_name;
self->private_impl.vtable_for__wuffs_base__io_transformer.function_pointers =
(const void*)(&wuffs_lzw__decoder__func_ptrs_for__wuffs_base__io_transformer);
return wuffs_base__make_status(NULL);
}
@@ -11415,6 +11489,15 @@ const char* wuffs_gzip__error__bad_header = "#gzip: bad header";
// ---------------- VTables
const wuffs_base__io_transformer__func_ptrs
wuffs_gzip__decoder__func_ptrs_for__wuffs_base__io_transformer = {
(wuffs_base__status(*)(void*,
wuffs_base__io_buffer*,
wuffs_base__io_buffer*,
wuffs_base__slice_u8))(
&wuffs_gzip__decoder__transform_io),
};
// ---------------- Initializer Implementations
wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
@@ -11474,6 +11557,10 @@ wuffs_gzip__decoder__initialize(wuffs_gzip__decoder* self,
}
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
self->private_impl.vtable_for__wuffs_base__io_transformer.vtable_name =
wuffs_base__io_transformer__vtable_name;
self->private_impl.vtable_for__wuffs_base__io_transformer.function_pointers =
(const void*)(&wuffs_gzip__decoder__func_ptrs_for__wuffs_base__io_transformer);
return wuffs_base__make_status(NULL);
}
@@ -11906,6 +11993,15 @@ const char* wuffs_zlib__error__incorrect_dictionary =
// ---------------- VTables
const wuffs_base__io_transformer__func_ptrs
wuffs_zlib__decoder__func_ptrs_for__wuffs_base__io_transformer = {
(wuffs_base__status(*)(void*,
wuffs_base__io_buffer*,
wuffs_base__io_buffer*,
wuffs_base__slice_u8))(
&wuffs_zlib__decoder__transform_io),
};
// ---------------- Initializer Implementations
wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
@@ -11974,6 +12070,10 @@ wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self,
}
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
self->private_impl.vtable_for__wuffs_base__io_transformer.vtable_name =
wuffs_base__io_transformer__vtable_name;
self->private_impl.vtable_for__wuffs_base__io_transformer.function_pointers =
(const void*)(&wuffs_zlib__decoder__func_ptrs_for__wuffs_base__io_transformer);
return wuffs_base__make_status(NULL);
}
+1 -1
View File
@@ -65,7 +65,7 @@ pri const dcode_magic_numbers array[32] base.u32 = [
pri const huffs_table_size base.u32 = 1024
pri const huffs_table_mask base.u32 = 1023
pub struct decoder?(
pub struct decoder? implements base.io_transformer(
// These fields yield src's bits in Least Significant Bits order.
bits : base.u32,
n_bits : base.u32,
+1 -1
View File
@@ -23,7 +23,7 @@ pub status "#bad header"
// TODO: reference deflate.decoder_workbuf_len_max_incl_worst_case.
pub const decoder_workbuf_len_max_incl_worst_case base.u64 = 1
pub struct decoder?(
pub struct decoder? implements base.io_transformer(
ignore_checksum : base.bool,
checksum : crc32.ieee_hasher,
+1 -1
View File
@@ -26,7 +26,7 @@ pri status "#internal error: inconsistent I/O"
// - 3056a84 Roll back 3 recent lzw.decoder.suffixes commits
pub const decoder_workbuf_len_max_incl_worst_case base.u64 = 0
pub struct decoder?(
pub struct decoder? implements base.io_transformer(
// set_literal_width_arg is 1 plus the saved argument passed to
// set_literal_width. This is assigned to the literal_width field at the
// start of transform_io. During that method, calling set_literal_width
+1 -1
View File
@@ -26,7 +26,7 @@ pub status "#incorrect dictionary"
// TODO: reference deflate.decoder_workbuf_len_max_incl_worst_case.
pub const decoder_workbuf_len_max_incl_worst_case base.u64 = 1
pub struct decoder?(
pub struct decoder? implements base.io_transformer(
bad_call_sequence : base.bool,
header_complete : base.bool,
+13
View File
@@ -155,6 +155,18 @@ golden_test deflate_romeo_fixed_gt = {
// ---------------- Deflate Tests
const char* test_wuffs_deflate_decode_interface() {
CHECK_FOCUS(__func__);
wuffs_deflate__decoder dec;
CHECK_STATUS("initialize",
wuffs_deflate__decoder__initialize(
&dec, sizeof dec, WUFFS_VERSION,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
return do_test__wuffs_base__io_transformer(
wuffs_deflate__decoder__upcast_as__wuffs_base__io_transformer(&dec),
"test/data/romeo.txt.deflate", 0, SIZE_MAX, 942, 0x0A);
}
const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
@@ -825,6 +837,7 @@ proc tests[] = {
test_wuffs_deflate_decode_deflate_distance_32768, //
test_wuffs_deflate_decode_deflate_distance_code_31, //
test_wuffs_deflate_decode_deflate_huffman_primlen_9, //
test_wuffs_deflate_decode_interface, //
test_wuffs_deflate_decode_midsummer, //
test_wuffs_deflate_decode_pi_just_one_read, //
test_wuffs_deflate_decode_pi_many_big_reads, //
+13
View File
@@ -83,6 +83,18 @@ golden_test gzip_pi_gt = {
// ---------------- Gzip Tests
const char* test_wuffs_gzip_decode_interface() {
CHECK_FOCUS(__func__);
wuffs_gzip__decoder dec;
CHECK_STATUS("initialize",
wuffs_gzip__decoder__initialize(
&dec, sizeof dec, WUFFS_VERSION,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
return do_test__wuffs_base__io_transformer(
wuffs_gzip__decoder__upcast_as__wuffs_base__io_transformer(&dec),
"test/data/romeo.txt.gz", 0, SIZE_MAX, 942, 0x0A);
}
const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
@@ -273,6 +285,7 @@ proc tests[] = {
test_wuffs_gzip_checksum_verify_bad0, //
test_wuffs_gzip_checksum_verify_bad7, //
test_wuffs_gzip_checksum_verify_good, //
test_wuffs_gzip_decode_interface, //
test_wuffs_gzip_decode_midsummer, //
test_wuffs_gzip_decode_pi, //
+13
View File
@@ -66,6 +66,18 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the
// ---------------- LZW Tests
const char* test_wuffs_lzw_decode_interface() {
CHECK_FOCUS(__func__);
wuffs_lzw__decoder dec;
CHECK_STATUS("initialize",
wuffs_lzw__decoder__initialize(
&dec, sizeof dec, WUFFS_VERSION,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
return do_test__wuffs_base__io_transformer(
wuffs_lzw__decoder__upcast_as__wuffs_base__io_transformer(&dec),
"test/data/bricks-nodither.indexes.giflzw", 1, SIZE_MAX, 19200, 0x4F);
}
const char* do_test_wuffs_lzw_decode(const char* src_filename,
uint64_t src_size,
const char* want_filename,
@@ -416,6 +428,7 @@ proc tests[] = {
test_wuffs_lzw_decode_bricks_dither, //
test_wuffs_lzw_decode_bricks_nodither, //
test_wuffs_lzw_decode_interface, //
test_wuffs_lzw_decode_many_big_reads, //
test_wuffs_lzw_decode_many_small_writes_reads, //
test_wuffs_lzw_decode_output_bad, //
+13
View File
@@ -94,6 +94,18 @@ const size_t zlib_sheep_want_len = 11;
// ---------------- Zlib Tests
const char* test_wuffs_zlib_decode_interface() {
CHECK_FOCUS(__func__);
wuffs_zlib__decoder dec;
CHECK_STATUS("initialize",
wuffs_zlib__decoder__initialize(
&dec, sizeof dec, WUFFS_VERSION,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
return do_test__wuffs_base__io_transformer(
wuffs_zlib__decoder__upcast_as__wuffs_base__io_transformer(&dec),
"test/data/romeo.txt.zlib", 0, SIZE_MAX, 942, 0x0A);
}
const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
@@ -347,6 +359,7 @@ proc tests[] = {
test_wuffs_zlib_checksum_verify_bad0, //
test_wuffs_zlib_checksum_verify_bad3, //
test_wuffs_zlib_checksum_verify_good, //
test_wuffs_zlib_decode_interface, //
test_wuffs_zlib_decode_midsummer, //
test_wuffs_zlib_decode_pi, //
test_wuffs_zlib_decode_sheep, //
+37
View File
@@ -757,4 +757,41 @@ const char* do_test__wuffs_base__hasher_u32(wuffs_base__hasher_u32* h,
return NULL;
}
const char* do_test__wuffs_base__io_transformer(wuffs_base__io_transformer* t,
const char* src_filename,
size_t src_ri,
size_t src_wi,
size_t want_wi,
uint8_t want_final_byte) {
if (want_wi > BUFFER_SIZE) {
return "want_wi is too large";
}
wuffs_base__io_buffer got = ((wuffs_base__io_buffer){
.data = global_got_slice,
});
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
.data = global_src_slice,
});
CHECK_STRING(read_file(&src, src_filename));
if (src.meta.ri < src_ri) {
src.meta.ri = src_ri;
}
if (src.meta.wi > src_wi) {
src.meta.wi = src_wi;
}
if (src.meta.ri > src.meta.wi) {
return "inconsistent src_ri and src_wi";
}
CHECK_STATUS("transform_io", wuffs_base__io_transformer__transform_io(
t, &got, &src, global_work_slice));
if (got.meta.wi != want_wi) {
RETURN_FAIL("dst wi: got %zu, want %zu", got.meta.wi, want_wi);
}
if ((want_wi > 0) && (got.data.ptr[want_wi - 1] != want_final_byte)) {
RETURN_FAIL("final byte: got 0x%02X, want 0x%02X",
got.data.ptr[want_wi - 1], want_final_byte);
}
return NULL;
}
#endif // WUFFS_INCLUDE_GUARD