From cf51406fcfd3ace1827b9381e03637fd7d09b3a5 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 24 Nov 2018 16:49:52 +1100 Subject: [PATCH] Mark deflate's init_fixed_huffman as !? not !?? --- cmd/wuffs-c/internal/cgen/statement.go | 12 ++++++++-- release/c/wuffs-unsupported-snapshot.h | 33 +++++++++++++------------- std/deflate/decode_deflate.wuffs | 4 ++-- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index 2b9524b1..a1fc8392 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -163,7 +163,11 @@ func (g *gen) writeStatementExpr(b *buffer, n *a.Expr, depth uint32) error { if n.Effect().Coroutine() { return nil } else if n.Effect().Optional() { - b.writes("status = ") + if g.currFunk.astFunc.Effect().Coroutine() { + b.writes("status = ") + } else { + b.writes("{ wuffs_base__status status = ") + } checkStatus = true } } @@ -172,7 +176,11 @@ func (g *gen) writeStatementExpr(b *buffer, n *a.Expr, depth uint32) error { } b.writes(";\n") if checkStatus { - b.writes("if (status) { goto exit; }\n") + if g.currFunk.astFunc.Effect().Coroutine() { + b.writes("if (status) { goto exit; }\n") + } else { + b.writes("if (status) { return status; }}\n") + } } return nil } diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index 63c649c6..94f434ec 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -5193,13 +5193,12 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, } goto label_0_continue; } else if (v_type == 1) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); status = wuffs_deflate__decoder__init_fixed_huffman(self); if (status) { - goto suspend; + goto exit; } } else if (v_type == 2) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (a_src.private_impl.buf) { a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; @@ -5217,7 +5216,7 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, goto exit; } self->private_impl.f_end_of_block = false; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); if (a_src.private_impl.buf) { a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; @@ -5233,7 +5232,7 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, if (self->private_impl.f_end_of_block) { goto label_0_continue; } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (a_src.private_impl.buf) { a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; @@ -5420,8 +5419,6 @@ exit: static wuffs_base__status // wuffs_deflate__decoder__init_fixed_huffman(wuffs_deflate__decoder* self) { - wuffs_base__status status = NULL; - uint32_t v_i; v_i = 0; @@ -5445,17 +5442,21 @@ wuffs_deflate__decoder__init_fixed_huffman(wuffs_deflate__decoder* self) { self->private_impl.f_code_lengths[v_i] = 5; v_i += 1; } - status = wuffs_deflate__decoder__init_huff(self, 0, 0, 288, 257); - if (status) { - goto exit; + { + wuffs_base__status status = + wuffs_deflate__decoder__init_huff(self, 0, 0, 288, 257); + if (status) { + return status; + } } - status = wuffs_deflate__decoder__init_huff(self, 1, 288, 320, 0); - if (status) { - goto exit; + { + wuffs_base__status status = + wuffs_deflate__decoder__init_huff(self, 1, 288, 320, 0); + if (status) { + return status; + } } - goto exit; -exit: - return status; + return NULL; } // -------- func deflate.decoder.init_dynamic_huffman diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index 91fcdd90..85683320 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -191,7 +191,7 @@ pri func decoder.decode_blocks!??(dst base.io_writer, src base.io_reader) { this.decode_uncompressed!??(dst:args.dst, src:args.src) continue } else if type == 1 { - this.init_fixed_huffman!??() + this.init_fixed_huffman!?() } else if type == 2 { this.init_dynamic_huffman!??(src:args.src) } else { @@ -243,7 +243,7 @@ pri func decoder.decode_uncompressed!??(dst base.io_writer, src base.io_reader) } // init_fixed_huffman initializes this.huffs as per the RFC section 3.2.6. -pri func decoder.init_fixed_huffman!??() { +pri func decoder.init_fixed_huffman!?() { var i base.u32 while i < 144 { this.code_lengths[i] = 8