Change status "?foo" to just "?foo"

This commit is contained in:
Nigel Tao committed 2018-11-24 12:36:42 +11:00
1 parent 5f9d007b1c
commit 875362ea07
14 files changed
+136 -152

No files matched your search

+36 -36
View File
@@ -195,7 +195,7 @@ pri func decoder.decode_blocks!??(dst base.io_writer, src base.io_reader) {
} else if type == 2 {
this.init_dynamic_huffman!??(src:args.src)
} else {
return status "?bad block"
return "?bad block"
}
this.end_of_block = false
@@ -207,7 +207,7 @@ pri func decoder.decode_blocks!??(dst base.io_writer, src base.io_reader) {
if this.end_of_block {
continue
}
return status "?internal error: inconsistent Huffman end_of_block"
return "?internal error: inconsistent Huffman end_of_block"
}
}
@@ -218,14 +218,14 @@ pri func decoder.decode_uncompressed!??(dst base.io_writer, src base.io_reader)
//
// Ditto for decode_huffman_slow and decode_huffman_fast.
if (this.n_bits >= 8) or ((this.bits >> this.n_bits) != 0) {
return status "?internal error: inconsistent n_bits"
return "?internal error: inconsistent n_bits"
}
this.n_bits = 0
this.bits = 0
var length base.u32 = args.src.read_u32le!??()
if (length.low_bits(n:16) + length.high_bits(n:16)) != 0xFFFF {
return status "?inconsistent stored block length"
return "?inconsistent stored block length"
}
length = length.low_bits(n:16)
while true {
@@ -235,9 +235,9 @@ pri func decoder.decode_uncompressed!??(dst base.io_writer, src base.io_reader)
}
length -= n_copied
if args.dst.available() == 0 {
yield status "$short write"
yield "$short write"
} else {
yield status "$short read"
yield "$short read"
}
}
}
@@ -281,12 +281,12 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) {
}
var n_lit base.u32[257..288] = bits.low_bits(n:5) + 257
if n_lit > 286 {
return status "?bad literal/length code count"
return "?bad literal/length code count"
}
bits >>= 5
var n_dist base.u32[1..32] = bits.low_bits(n:5) + 1
if n_dist > 30 {
return status "?bad distance code count"
return "?bad distance code count"
}
bits >>= 5
var n_clen base.u32[4..19] = bits.low_bits(n:4) + 4
@@ -340,7 +340,7 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) {
// For H-CL, there should be no redirections and all symbols should be
// literals.
if (table_entry >> 24) != 0x80 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
table_entry = (table_entry >> 8) & 0xFF
@@ -358,7 +358,7 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) {
if table_entry == 16 {
n_extra_bits = 2
if i <= 0 {
return status "?bad Huffman code length repetition"
return "?bad Huffman code length repetition"
}
rep_symbol = this.code_lengths[i - 1]
rep_count = 3
@@ -374,7 +374,7 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) {
rep_count = 11
assert rep_count <= 11
} else {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
while n_bits < n_extra_bits,
inv i < 320,
@@ -392,7 +392,7 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) {
while rep_count > 0 {
// TODO: hoist this check up one level?
if i >= (n_lit + n_dist) {
return status "?bad Huffman code length count"
return "?bad Huffman code length count"
}
assert i < (288 + 32) via "a < (b + c): a < (b0 + c0); b0 <= b; c0 <= c"(b0:n_lit, c0:n_dist)
this.code_lengths[i] = rep_symbol
@@ -402,10 +402,10 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) {
}
if i != (n_lit + n_dist) {
return status "?bad Huffman code length count"
return "?bad Huffman code length count"
}
if this.code_lengths[256] == 0 {
return status "?missing end-of-block code"
return "?missing end-of-block code"
}
this.init_huff!??(which:0, n_codes0:0, n_codes1:n_lit, base_symbol:257)
@@ -461,13 +461,13 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
// TODO: this if should be unnecessary. Have some way to assert that,
// for all j, counts[j] <= i, and thus counts[j]++ will not overflow.
if counts[this.code_lengths[i]] >= 320 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
counts[this.code_lengths[i]] += 1
i += 1
}
if ((counts[0] as base.u32) + args.n_codes0) == args.n_codes1 {
return status "?no Huffman codes"
return "?no Huffman codes"
}
// Check that the Huffman code completely covers all possible input bits.
@@ -475,19 +475,19 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
i = 1
while i <= 15 {
if remaining > (1 << 30) {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
// Each iteration doubles the number of possible remaining codes.
remaining <<= 1
if remaining < (counts[i] as base.u32) {
return status "?bad Huffman code (over-subscribed)"
return "?bad Huffman code (over-subscribed)"
}
remaining -= counts[i] as base.u32
i += 1
}
if remaining != 0 {
// TODO: when is a degenerate Huffman table valid?
return status "?bad Huffman code (under-subscribed)"
return "?bad Huffman code (under-subscribed)"
}
// Calculate offsets and n_symbols.
@@ -509,7 +509,7 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
offsets[i] = n_symbols as base.u16
var count base.u32[..320] = counts[i] as base.u32
if n_symbols > (320 - count) {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
assert (n_symbols + count) <= 320 via "(a + b) <= c: a <= (c - b)"()
// TODO: change this to n_symbols += count, once the proof engine's
@@ -518,7 +518,7 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
i += 1
}
if n_symbols > 288 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
// Calculate symbols.
@@ -547,11 +547,11 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
assert i < 320 via "a < b: a < c; c <= b"(c:args.n_codes1)
// TODO: this if check should be unnecessary.
if i < args.n_codes0 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
if this.code_lengths[i] != 0 {
if offsets[this.code_lengths[i]] >= 320 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
symbols[offsets[this.code_lengths[i]]] = (i - args.n_codes0) as base.u16
offsets[this.code_lengths[i]] += 1
@@ -572,7 +572,7 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
break
}
if min_cl >= 9 {
return status "?bad Huffman minimum code length"
return "?bad Huffman minimum code length"
}
min_cl += 1
}
@@ -585,7 +585,7 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
}
if max_cl <= 1 {
// TODO: when is a degenerate Huffman table valid?
return status "?no Huffman codes"
return "?no Huffman codes"
}
max_cl -= 1
}
@@ -610,10 +610,10 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
// - this.huffs[0][0b11111] = 0x80001805 (literal, symbols[9]=0x18, code_length=5)
i = 0
if (n_symbols != (offsets[max_cl] as base.u32)) or (n_symbols != (offsets[15] as base.u32)) {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
if (args.n_codes0 + (symbols[0] as base.u32)) >= 320 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
var initial_high_bits base.u32 = 1 << 9
@@ -633,13 +633,13 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
inv n_symbols <= 288,
{
if (args.n_codes0 + (symbols[i] as base.u32)) >= 320 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
var cl base.u32[..15] = this.code_lengths[args.n_codes0 + (symbols[i] as base.u32)] as base.u32
if cl > prev_cl {
code <<= cl - prev_cl
if code >= (1 << 15) {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
}
// For the remainder of this loop body, prev_cl is the original code
@@ -674,20 +674,20 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
}
remaining -= counts[j] as base.u32
if remaining > (1 << 30) {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
remaining <<= 1
j += 1
}
if (j <= 9) or (15 < j) {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
tmp = j - 9
initial_high_bits = (1 as base.u32) << tmp
top = next_top
if (top + ((1 as base.u32) << tmp)) > 1234 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
next_top = top + ((1 as base.u32) << tmp)
@@ -696,7 +696,7 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
}
}
if (key >= (1 << 9)) or (counts[prev_cl] <= 0) {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
counts[prev_cl] -= 1
@@ -719,7 +719,7 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
value = dcode_magic_numbers[symbol & 31] | cl
}
} else {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
// The table uses log2(initial_high_bits) bits, but reversed_key only
@@ -734,7 +734,7 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
{
high_bits -= delta
if (top + ((high_bits | reversed_key) & 511)) >= 1234 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
this.huffs[args.which][top + ((high_bits | reversed_key) & 511)] = value
}
@@ -746,7 +746,7 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c
assert i < 288 via "a < b: a < c; c <= b"(c:n_symbols)
code += 1
if code >= (1 << 15) {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
}
}
+16 -16
View File
@@ -21,7 +21,7 @@ pri func decoder.decode_huffman_fast!??(dst base.io_writer, src base.io_reader)
// correctness and performance.
if (this.n_bits >= 8) or ((this.bits >> this.n_bits) != 0) {
return status "?internal error: inconsistent n_bits"
return "?internal error: inconsistent n_bits"
}
var bits base.u32 = this.bits
@@ -119,7 +119,7 @@ pri func decoder.decode_huffman_fast!??(dst base.io_writer, src base.io_reader)
var redir_top base.u32[..0xFFFF] = (table_entry >> 8) & 0xFFFF
var redir_mask base.u32[..0x7FFF] = ((1 as base.u32) << ((table_entry >> 4) & 0x0F)) - 1
if (redir_top + (bits & redir_mask)) >= 1234 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
table_entry = this.huffs[0][redir_top + (bits & redir_mask)]
table_entry_n_bits = table_entry & 0x0F
@@ -137,20 +137,20 @@ pri func decoder.decode_huffman_fast!??(dst base.io_writer, src base.io_reader)
this.end_of_block = true
break:loop
} else if (table_entry >> 28) != 0 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
} else if (table_entry >> 27) != 0 {
return status "?bad Huffman code"
return "?bad Huffman code"
} else {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
// Once again, redundant but explicit assertions.
assert args.src.available() >= 8
} else if (table_entry >> 27) != 0 {
return status "?bad Huffman code"
return "?bad Huffman code"
} else {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
// length = base_number + extra_bits.
@@ -182,7 +182,7 @@ pri func decoder.decode_huffman_fast!??(dst base.io_writer, src base.io_reader)
assert args.src.available() >= 6
}
if length > 258 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
// Ensure that we have at least 15 bits of input.
@@ -230,7 +230,7 @@ pri func decoder.decode_huffman_fast!??(dst base.io_writer, src base.io_reader)
redir_top = (table_entry >> 8) & 0xFFFF
redir_mask = ((1 as base.u32) << ((table_entry >> 4) & 0x0F)) - 1
if (redir_top + (bits & redir_mask)) >= 1234 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
table_entry = this.huffs[1][redir_top + (bits & redir_mask)]
table_entry_n_bits = table_entry & 0x0F
@@ -243,9 +243,9 @@ pri func decoder.decode_huffman_fast!??(dst base.io_writer, src base.io_reader)
// For H-D, all symbols should be base_number + extra_bits.
if (table_entry >> 24) != 0x40 {
if (table_entry >> 24) == 0x08 {
return status "?bad Huffman code"
return "?bad Huffman code"
}
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
// dist_minus_1 = base_number_minus_1 + extra_bits.
@@ -299,7 +299,7 @@ pri func decoder.decode_huffman_fast!??(dst base.io_writer, src base.io_reader)
hlen = hdist
// TODO: this if check should be redundant.
if length > 258 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
} else {
hlen = length
@@ -307,7 +307,7 @@ pri func decoder.decode_huffman_fast!??(dst base.io_writer, src base.io_reader)
assert length <= 258
}
if this.history_index < hdist {
return status "?bad distance"
return "?bad distance"
}
// Re-purpose the hdist variable as the this.history index to
// start copying from.
@@ -346,7 +346,7 @@ pri func decoder.decode_huffman_fast!??(dst base.io_writer, src base.io_reader)
}
if ((dist_minus_1 + 1) as base.u64) > args.dst.since_mark().length() {
return status "?internal error: inconsistent distance"
return "?internal error: inconsistent distance"
}
}
// Once again, redundant but explicit assertions.
@@ -382,7 +382,7 @@ pri func decoder.decode_huffman_fast!??(dst base.io_writer, src base.io_reader)
if args.src.can_undo_byte() {
args.src.undo_byte!()
} else {
return status "?internal error: inconsistent I/O"
return "?internal error: inconsistent I/O"
}
}
@@ -390,6 +390,6 @@ pri func decoder.decode_huffman_fast!??(dst base.io_writer, src base.io_reader)
this.n_bits = n_bits
if (this.n_bits >= 8) or ((this.bits >> this.n_bits) != 0) {
return status "?internal error: inconsistent n_bits"
return "?internal error: inconsistent n_bits"
}
}
+15 -15
View File
@@ -19,7 +19,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
// correctness and performance.
if (this.n_bits >= 8) or ((this.bits >> this.n_bits) != 0) {
return status "?internal error: inconsistent n_bits"
return "?internal error: inconsistent n_bits"
}
var bits base.u32 = this.bits
@@ -61,7 +61,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
var redir_mask base.u32[..0x7FFF] = ((1 as base.u32) << ((table_entry >> 4) & 0x0F)) - 1
while true {
if (redir_top + (bits & redir_mask)) >= 1234 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
table_entry = this.huffs[0][redir_top + (bits & redir_mask)]
table_entry_n_bits = table_entry & 0x0F
@@ -86,17 +86,17 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
this.end_of_block = true
break:loop
} else if (table_entry >> 28) != 0 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
} else if (table_entry >> 27) != 0 {
return status "?bad Huffman code"
return "?bad Huffman code"
} else {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
} else if (table_entry >> 27) != 0 {
return status "?bad Huffman code"
return "?bad Huffman code"
} else {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
// length = base_number + extra_bits.
@@ -134,7 +134,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
redir_mask = ((1 as base.u32) << ((table_entry >> 4) & 0x0F)) - 1
while true {
if (redir_top + (bits & redir_mask)) >= 1234 {
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
table_entry = this.huffs[1][redir_top + (bits & redir_mask)]
table_entry_n_bits = table_entry & 0x0F
@@ -152,9 +152,9 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
// For H-D, all symbols should be base_number + extra_bits.
if (table_entry >> 24) != 0x40 {
if (table_entry >> 24) == 0x08 {
return status "?bad Huffman code"
return "?bad Huffman code"
}
return status "?internal error: inconsistent Huffman decoder state"
return "?internal error: inconsistent Huffman decoder state"
}
// dist_minus_1 = base_number_minus_1 + extra_bits.
@@ -198,7 +198,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
length = 0
}
if this.history_index < hdist {
return status "?bad distance"
return "?bad distance"
}
// Re-purpose the hdist variable as the this.history index to
// start copying from.
@@ -220,7 +220,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
break
}
}
yield status "$short write"
yield "$short write"
}
// Copy from the start of this.history, if we wrapped around.
if hlen > 0 {
@@ -233,7 +233,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
}
hlen -= n_copied
hdist ~mod+= n_copied
yield status "$short write"
yield "$short write"
}
}
@@ -250,7 +250,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
break
}
length -= n_copied
yield status "$short write"
yield "$short write"
}
}
@@ -260,6 +260,6 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
this.n_bits = n_bits
if (this.n_bits >= 8) or ((this.bits >> this.n_bits) != 0) {
return status "?internal error: inconsistent n_bits"
return "?internal error: inconsistent n_bits"
}
}