From e7ed1dd43e04ed9cd85b1a6e73c3601faf86e326 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 17 Nov 2021 12:58:12 +1100 Subject: [PATCH] Add std/png tell_me_more while.loop name --- release/c/wuffs-unsupported-snapshot.c | 28 +++++++++++++------------- std/png/decode_png.wuffs | 14 ++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 3eee25fc..d6934471 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -40517,7 +40517,7 @@ wuffs_png__decoder__tell_me_more( self->private_impl.f_metadata_z); } if (self->private_impl.f_metadata_flavor != 4) { - goto label__0__break; + goto label__loop__break; } if (self->private_impl.f_metadata_is_zlib_compressed) { if (self->private_impl.f_chunk_type == 1346585449) { @@ -40553,7 +40553,7 @@ wuffs_png__decoder__tell_me_more( } if (wuffs_base__status__is_ok(&v_zlib_status)) { self->private_impl.f_metadata_is_zlib_compressed = false; - goto label__0__break; + goto label__loop__break; } else if ( ! wuffs_base__status__is_suspension(&v_zlib_status)) { status = v_zlib_status; if (wuffs_base__status__is_error(&status)) { @@ -40599,7 +40599,7 @@ wuffs_png__decoder__tell_me_more( } if (wuffs_base__status__is_ok(&v_zlib_status)) { self->private_impl.f_metadata_is_zlib_compressed = false; - goto label__0__break; + goto label__loop__break; } else if ( ! wuffs_base__status__is_suspension(&v_zlib_status)) { status = v_zlib_status; if (wuffs_base__status__is_error(&status)) { @@ -40645,7 +40645,7 @@ wuffs_png__decoder__tell_me_more( } if (wuffs_base__status__is_ok(&v_zlib_status)) { self->private_impl.f_metadata_is_zlib_compressed = false; - goto label__0__break; + goto label__loop__break; } else if ( ! wuffs_base__status__is_suspension(&v_zlib_status)) { status = v_zlib_status; if (wuffs_base__status__is_error(&status)) { @@ -40663,39 +40663,39 @@ wuffs_png__decoder__tell_me_more( goto exit; } } else { - label__1__continue:; + label__0__continue:; while (true) { if (self->private_impl.f_chunk_length <= 0) { if (self->private_impl.f_metadata_fourcc == 1263947851) { status = wuffs_base__make_status(wuffs_png__error__bad_chunk); goto exit; } - goto label__1__break; + goto label__0__break; } else if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { status = wuffs_base__make_status(wuffs_base__suspension__short_read); WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4); - goto label__1__continue; + goto label__0__continue; } v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src); if (v_c == 0) { self->private_impl.f_chunk_length -= 1; iop_a_src += 1; - goto label__1__break; + goto label__0__break; } if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0) { status = wuffs_base__make_status(wuffs_base__suspension__short_write); WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5); - goto label__1__continue; + goto label__0__continue; } self->private_impl.f_chunk_length -= 1; iop_a_src += 1; (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, v_c), iop_a_dst += 1); } - label__1__break:; - goto label__0__break; + label__0__break:; + goto label__loop__break; } } - label__0__break:; + label__loop__break:; if (self->private_impl.f_metadata_fourcc == 1263947851) { self->private_impl.f_metadata_fourcc = 1263947862; if (self->private_impl.f_chunk_type == 1951945833) { @@ -40753,10 +40753,10 @@ wuffs_png__decoder__tell_me_more( v_c = t_5; } if (v_c == 0) { - goto label__2__break; + goto label__1__break; } } - label__2__break:; + label__1__break:; } } else if (self->private_impl.f_chunk_type == 1951945850) { if (self->private_impl.f_chunk_length <= 0) { diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index cdf3db25..f9105c1f 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -1344,7 +1344,7 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform this.zlib_is_dirty = true } - while true { + while.loop true { if args.minfo <> nullptr { args.minfo.set!( flavor: this.metadata_flavor, @@ -1355,7 +1355,7 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform } if this.metadata_flavor <> base.MORE_INFORMATION__FLAVOR__METADATA_RAW_TRANSFORM { - break + break.loop } if this.metadata_is_zlib_compressed { @@ -1370,7 +1370,7 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform if zlib_status.is_ok() { this.metadata_is_zlib_compressed = false - break + break.loop } else if not zlib_status.is_suspension() { return zlib_status } @@ -1388,7 +1388,7 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform if zlib_status.is_ok() { this.metadata_is_zlib_compressed = false - break + break.loop } else if not zlib_status.is_suspension() { return zlib_status } @@ -1406,7 +1406,7 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform if zlib_status.is_ok() { this.metadata_is_zlib_compressed = false - break + break.loop } else if not zlib_status.is_suspension() { return zlib_status } @@ -1443,9 +1443,9 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform args.src.skip_u32_fast!(actual: 1, worst_case: 1) args.dst.write_u8_fast!(a: c) } endwhile - break + break.loop } - } endwhile + } endwhile.loop // Key-value pairs come in... pairs. if this.metadata_fourcc == 'KVPK'be {