From 248436c231eb75bf2d524a44e5bce1127c8211d4 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 24 Nov 2018 21:22:25 +1100 Subject: [PATCH] Mark gif methods as !? not !?? --- cmd/wuffs-c/internal/cgen/func.go | 4 ++-- cmd/wuffs-c/internal/cgen/var.go | 2 ++ release/c/wuffs-unsupported-snapshot.h | 23 +++++++++-------------- std/gif/decode_gif.wuffs | 10 +++++----- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/func.go b/cmd/wuffs-c/internal/cgen/func.go index 82dd05cd..52650454 100644 --- a/cmd/wuffs-c/internal/cgen/func.go +++ b/cmd/wuffs-c/internal/cgen/func.go @@ -225,7 +225,7 @@ func (g *gen) writeFuncImplPrologue(b *buffer) error { out := g.currFunk.astFunc.Out() b.writes("if (!self) { return ") - if g.currFunk.astFunc.Effect().Coroutine() { + if g.currFunk.astFunc.Effect().Optional() { b.writes("wuffs_base__error__bad_receiver") } else if err := g.writeOutParamZeroValue(b, out); err != nil { return err @@ -233,7 +233,7 @@ func (g *gen) writeFuncImplPrologue(b *buffer) error { b.writes(";}") b.writes("if (self->private_impl.magic != WUFFS_BASE__MAGIC) { return ") - if g.currFunk.astFunc.Effect().Coroutine() { + if g.currFunk.astFunc.Effect().Optional() { b.writes("(self->private_impl.magic == WUFFS_BASE__DISABLED) " + "? wuffs_base__error__disabled_by_previous_error " + ": wuffs_base__error__check_wuffs_version_missing") diff --git a/cmd/wuffs-c/internal/cgen/var.go b/cmd/wuffs-c/internal/cgen/var.go index b3640b84..71b25f92 100644 --- a/cmd/wuffs-c/internal/cgen/var.go +++ b/cmd/wuffs-c/internal/cgen/var.go @@ -268,6 +268,8 @@ func (g *gen) writeResumeSuspend1(b *buffer, f *funk, n *a.Var, suspend bool, in zero := "0" if typ.QID() == (t.QID{t.IDBase, t.IDBool}) { zero = "false" + } else if typ.QID() == (t.QID{t.IDBase, t.IDStatus}) { + zero = "NULL" } b.printf("%s = %s;\n", local, zero) } diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index d2ebe29d..4f7db039 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -2722,7 +2722,6 @@ struct wuffs_gif__decoder__struct { uint32_t v_num_palette_entries; uint32_t v_i; uint64_t v_block_size; - wuffs_base__status v_z; uint64_t scratch; } c_decode_id_part1[1]; } private_impl; @@ -5014,7 +5013,7 @@ wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self, uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; if (coro_susp_point) { - v_z = 0; + v_z = NULL; v_written = ((wuffs_base__slice_u8){}); v_n_copied = 0; v_already_full = 0; @@ -8977,7 +8976,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, v_lw = 0; v_block_size = self->private_impl.c_decode_id_part1[0].v_block_size; v_w = ((wuffs_base__io_writer){}); - v_z = self->private_impl.c_decode_id_part1[0].v_z; + v_z = NULL; } else { v_w = ((wuffs_base__io_writer){}); } @@ -9112,15 +9111,14 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, if (((uint64_t)(io1_a_src - iop_a_src)) == 0) { if (self->private_impl.f_uncompressed_ri != self->private_impl.f_uncompressed_wi) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); status = wuffs_gif__decoder__copy_to_image_buffer(self, a_dst); if (status) { - goto suspend; + goto exit; } } } { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; @@ -9187,10 +9185,9 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, } if (self->private_impl.f_uncompressed_ri != self->private_impl.f_uncompressed_wi) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); status = wuffs_gif__decoder__copy_to_image_buffer(self, a_dst); if (status) { - goto suspend; + goto exit; } } if (wuffs_base__status__is_ok(v_z)) { @@ -9201,17 +9198,16 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, goto label_1_continue; } status = v_z; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6); } label_1_break:; } label_0_break:; if (self->private_impl.f_uncompressed_ri != self->private_impl.f_uncompressed_wi) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); status = wuffs_gif__decoder__copy_to_image_buffer(self, a_dst); if (status) { - goto suspend; + goto exit; } } @@ -9228,7 +9224,6 @@ suspend: v_num_palette_entries; self->private_impl.c_decode_id_part1[0].v_i = v_i; self->private_impl.c_decode_id_part1[0].v_block_size = v_block_size; - self->private_impl.c_decode_id_part1[0].v_z = v_z; goto exit; exit: @@ -9507,7 +9502,7 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, v_xlen = 0; 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_z = 0; + v_z = NULL; v_checksum_want = self->private_impl.c_decode[0].v_checksum_want; v_decoded_length_want = 0; } else { @@ -9955,7 +9950,7 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, if (coro_susp_point) { v_x = 0; v_checksum_got = self->private_impl.c_decode[0].v_checksum_got; - v_z = 0; + v_z = NULL; v_checksum_want = 0; } else { } diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index aa146e5b..f6d67ace 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -185,7 +185,7 @@ pub func decoder.workbuf_len() base.range_ii_u64 { max_incl:this.width as base.u64) } -pub func decoder.restart_frame!??(index base.u64, io_position base.u64) { +pub func decoder.restart_frame!?(index base.u64, io_position base.u64) { if this.call_sequence == 0 { return base."?bad call sequence" } @@ -608,7 +608,7 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade while true { if args.src.available() == 0 { if this.uncompressed_ri != this.uncompressed_wi { - this.copy_to_image_buffer!??(pb:args.dst) + this.copy_to_image_buffer!?(pb:args.dst) } } var block_size base.u64 = args.src.read_u8!??() as base.u64 @@ -639,7 +639,7 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade } if this.uncompressed_ri != this.uncompressed_wi { - this.copy_to_image_buffer!??(pb:args.dst) + this.copy_to_image_buffer!?(pb:args.dst) } if z.is_ok() { @@ -655,13 +655,13 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade } if this.uncompressed_ri != this.uncompressed_wi { - this.copy_to_image_buffer!??(pb:args.dst) + this.copy_to_image_buffer!?(pb:args.dst) } // TODO: check for "not enough pixel data". } -pri func decoder.copy_to_image_buffer!??(pb ptr base.pixel_buffer) { +pri func decoder.copy_to_image_buffer!?(pb ptr base.pixel_buffer) { // TODO: don't assume a packed pixel format. var dst slice base.u8 var src slice base.u8