From b402429eee71bb5d30327b8e959da44e82343f39 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 13 Oct 2017 14:55:15 +1100 Subject: [PATCH] Remove some redundant inequalities. --- gen/c/std/flate.c | 25 +++++-------------------- std/flate/decode_flate.puffs | 18 +++++------------- 2 files changed, 10 insertions(+), 33 deletions(-) diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 234ff218..3e52c156 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -1153,13 +1153,9 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed( while (true) { v_n = puffs_base_writer1_copy_from_reader32( &b_wptr_dst, b_wend_dst, &b_rptr_src, b_rend_src, v_length); - if (v_length == v_n) { + if (v_length <= v_n) { v_length = 0; goto label_0_break; - } else if (v_length < v_n) { - status = - PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE; - goto exit; } v_length -= v_n; if (((uint64_t)(b_wend_dst - b_wptr_dst)) == 0) { @@ -1492,13 +1488,9 @@ puffs_flate_status puffs_flate_decoder_decode_huffman( .len = 32768}), v_hdist), v_hlen); - if (v_hlen == v_n) { + if (v_hlen <= v_n) { v_hlen = 0; goto label_6_break; - } else if (v_hlen < v_n) { - status = - PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE; - goto exit; } if (v_n > 0) { v_hlen -= v_n; @@ -1520,13 +1512,9 @@ puffs_flate_status puffs_flate_decoder_decode_huffman( .ptr = self->private_impl.f_history, .len = 32768}), v_hdist), v_hlen); - if (v_hlen == v_n) { + if (v_hlen <= v_n) { v_hlen = 0; goto label_7_break; - } else if (v_hlen < v_n) { - status = - PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE; - goto exit; } v_hlen -= v_n; v_hdist = ((v_hdist + (v_n & 32767)) & 32767); @@ -1541,12 +1529,9 @@ puffs_flate_status puffs_flate_decoder_decode_huffman( } v_n = puffs_base_writer1_copy_from_history32( &b_wptr_dst, b_wstart_dst, b_wend_dst, v_distance, v_length); - if (v_length == v_n) { + if (v_length <= v_n) { + v_length = 0; goto label_5_break; - } else if (v_length < v_n) { - status = - PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE; - goto exit; } v_length -= v_n; status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE; diff --git a/std/flate/decode_flate.puffs b/std/flate/decode_flate.puffs index dc71676d..23b107d4 100644 --- a/std/flate/decode_flate.puffs +++ b/std/flate/decode_flate.puffs @@ -210,12 +210,9 @@ pri func decoder.decode_uncompressed?(dst writer1, src reader1)() { length = length.low_bits(n:16) while true { var n u32 = in.dst.copy_from_reader32(r:in.src, length:length) - // TODO: assert n <= length and simplify the subsequent if. - if length == n { + if length <= n { length = 0 break - } else if length < n { - return error "internal error: inconsistent Huffman decoder state" } length -= n if in.dst.available() == 0 { @@ -388,11 +385,9 @@ pri func decoder.decode_huffman?(dst writer1, src reader1)() { // Copy from hdist to the end of this.history. while true { n = in.dst.copy_from_slice32(s:this.history[hdist:], length:hlen) - if hlen == n { + if hlen <= n { hlen = 0 break - } else if hlen < n { - return error "internal error: inconsistent Huffman decoder state" } if n > 0 { hlen -= n @@ -416,11 +411,9 @@ pri func decoder.decode_huffman?(dst writer1, src reader1)() { if hlen > 0 { while true { n = in.dst.copy_from_slice32(s:this.history[hdist:], length:hlen) - if hlen == n { + if hlen <= n { hlen = 0 break - } else if hlen < n { - return error "internal error: inconsistent Huffman decoder state" } hlen -= n hdist = (hdist + (n & 0x7FFF)) & 0x7FFF @@ -437,10 +430,9 @@ pri func decoder.decode_huffman?(dst writer1, src reader1)() { // Copy from in.dst. n = in.dst.copy_from_history32(distance:distance, length:length) - if length == n { + if length <= n { + length = 0 break - } else if length < n { - return error "internal error: inconsistent Huffman decoder state" } length -= n // TODO: "closed for writes" instead?