diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index f5479671..f6b458a1 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -116,11 +116,10 @@ func Do(args []string) error { "// !! INSERT wuffs_base__status__string data.\n": func(b *buffer) error { messages := [256]string{} for _, z := range builtin.StatusList { - statusPrefix := "?" - if z.Keyword == t.IDSuspension { - statusPrefix = "$" + if z.Message == "" { + continue } - messages[uint8(z.Value)] = statusPrefix + "base: " + z.Message + messages[uint8(z.Value)] = z.Message[:1] + "base: " + z.Message[1:] } if err := genStatusStringData(b, "wuffs_base__", &messages); err != nil { return err @@ -474,11 +473,10 @@ func (g *gen) genImpl(b *buffer) error { messages := [256]string{} { for _, s := range g.statusList { - statusPrefix := "?" - if s.keyword == t.IDSuspension { - statusPrefix = "$" + if s.msg == "" { + continue } - messages[uint8(s.value)] = statusPrefix + g.pkgName + ": " + s.msg + messages[uint8(s.value)] = s.msg[:1] + g.pkgName + ": " + s.msg[1:] } if err := genStatusStringData(b, g.pkgPrefix, &messages); err != nil { return err diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 9974296a..1a962581 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -37,23 +37,23 @@ func (z Status) String() string { } var StatusList = [...]Status{ - {0, 0x00, "ok"}, + {0, 0x00, "+ok"}, - {t.IDError, -0x01, "bad wuffs version"}, - {t.IDError, -0x02, "bad sizeof receiver"}, - {t.IDError, -0x03, "bad receiver"}, - {t.IDError, -0x04, "bad argument"}, - {t.IDError, -0x04, "bad argument (length too short)"}, + {t.IDError, -0x01, "?bad wuffs version"}, + {t.IDError, -0x02, "?bad sizeof receiver"}, + {t.IDError, -0x03, "?bad receiver"}, + {t.IDError, -0x04, "?bad argument"}, + {t.IDError, -0x04, "?bad argument (length too short)"}, - {t.IDError, -0x10, "check_wuffs_version missing"}, - {t.IDError, -0x11, "check_wuffs_version called twice"}, - {t.IDError, -0x12, "invalid call sequence"}, + {t.IDError, -0x10, "?check_wuffs_version missing"}, + {t.IDError, -0x11, "?check_wuffs_version called twice"}, + {t.IDError, -0x12, "?invalid call sequence"}, - {t.IDError, -0x20, "cannot return a suspension"}, + {t.IDError, -0x20, "?cannot return a suspension"}, - {t.IDSuspension, +0x01, "end of data"}, - {t.IDSuspension, +0x02, "short read"}, - {t.IDSuspension, +0x03, "short write"}, + {t.IDSuspension, +0x01, "$end of data"}, + {t.IDSuspension, +0x02, "$short read"}, + {t.IDSuspension, +0x03, "$short write"}, } var StatusMap = map[string]Status{} diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index 5f58aba5..fde79743 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -3787,7 +3787,7 @@ wuffs_base__io_writer__set_mark(wuffs_base__io_writer* o, uint8_t* mark) { #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE) static const char wuffs_base__status__string_data[] = { - 0x00, 0x3F, 0x62, 0x61, 0x73, 0x65, 0x3A, 0x20, 0x6F, 0x6B, 0x00, 0x24, + 0x00, 0x2B, 0x62, 0x61, 0x73, 0x65, 0x3A, 0x20, 0x6F, 0x6B, 0x00, 0x24, 0x62, 0x61, 0x73, 0x65, 0x3A, 0x20, 0x65, 0x6E, 0x64, 0x20, 0x6F, 0x66, 0x20, 0x64, 0x61, 0x74, 0x61, 0x00, 0x24, 0x62, 0x61, 0x73, 0x65, 0x3A, 0x20, 0x73, 0x68, 0x6F, 0x72, 0x74, 0x20, 0x72, 0x65, 0x61, 0x64, 0x00, diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index 0eebfbba..65fe9584 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -14,25 +14,25 @@ packageid "dflt" -pub error (0x01) "bad Huffman code (over-subscribed)" -pub error (0x02) "bad Huffman code (under-subscribed)" -pub error (0x03) "bad Huffman code length count" -pub error (0x04) "bad Huffman code length repetition" -pub error (0x05) "bad Huffman code" -pub error (0x06) "bad Huffman minimum code length" -pub error (0x07) "bad block" -pub error (0x08) "bad distance" -pub error (0x09) "bad distance code count" -pub error (0x0A) "bad literal/length code count" -pub error (0x0B) "inconsistent stored block length" -pub error (0x0C) "missing end-of-block code" -pub error (0x0D) "no Huffman codes" +pub error (0x01) "?bad Huffman code (over-subscribed)" +pub error (0x02) "?bad Huffman code (under-subscribed)" +pub error (0x03) "?bad Huffman code length count" +pub error (0x04) "?bad Huffman code length repetition" +pub error (0x05) "?bad Huffman code" +pub error (0x06) "?bad Huffman minimum code length" +pub error (0x07) "?bad block" +pub error (0x08) "?bad distance" +pub error (0x09) "?bad distance code count" +pub error (0x0A) "?bad literal/length code count" +pub error (0x0B) "?inconsistent stored block length" +pub error (0x0C) "?missing end-of-block code" +pub error (0x0D) "?no Huffman codes" -pri error (0x40) "internal error: inconsistent Huffman decoder state" -pri error (0x41) "internal error: inconsistent Huffman end_of_block" -pub error (0x42) "internal error: inconsistent I/O" -pri error (0x43) "internal error: inconsistent distance" -pri error (0x44) "internal error: inconsistent n_bits" +pri error (0x40) "?internal error: inconsistent Huffman decoder state" +pri error (0x41) "?internal error: inconsistent Huffman end_of_block" +pub error (0x42) "?internal error: inconsistent I/O" +pri error (0x43) "?internal error: inconsistent distance" +pri error (0x44) "?internal error: inconsistent n_bits" // The next two tables were created by script/print-deflate-magic-numbers.go. // @@ -197,7 +197,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 error "bad block" + return error "?bad block" } this.end_of_block = false @@ -209,7 +209,7 @@ pri func decoder.decode_blocks!??(dst base.io_writer, src base.io_reader) { if this.end_of_block { continue } - return error "internal error: inconsistent Huffman end_of_block" + return error "?internal error: inconsistent Huffman end_of_block" } } @@ -220,14 +220,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 error "internal error: inconsistent n_bits" + return error "?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 error "inconsistent stored block length" + return error "?inconsistent stored block length" } length = length.low_bits(n:16) while true { @@ -237,9 +237,9 @@ pri func decoder.decode_uncompressed!??(dst base.io_writer, src base.io_reader) } length -= n_copied if args.dst.available() == 0 { - yield suspension "short write" + yield suspension "$short write" } else { - yield suspension "short read" + yield suspension "$short read" } } } @@ -283,12 +283,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 error "bad literal/length code count" + return error "?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 error "bad distance code count" + return error "?bad distance code count" } bits >>= 5 var n_clen base.u32[4..19] = bits.low_bits(n:4) + 4 @@ -342,7 +342,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 error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } table_entry = (table_entry >> 8) & 0xFF @@ -360,7 +360,7 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) { if table_entry == 16 { n_extra_bits = 2 if i <= 0 { - return error "bad Huffman code length repetition" + return error "?bad Huffman code length repetition" } rep_symbol = this.code_lengths[i - 1] rep_count = 3 @@ -376,7 +376,7 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) { rep_count = 11 assert rep_count <= 11 } else { - return error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } while n_bits < n_extra_bits, inv i < 320, @@ -394,7 +394,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 error "bad Huffman code length count" + return error "?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 @@ -404,10 +404,10 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) { } if i != (n_lit + n_dist) { - return error "bad Huffman code length count" + return error "?bad Huffman code length count" } if this.code_lengths[256] == 0 { - return error "missing end-of-block code" + return error "?missing end-of-block code" } this.init_huff!??(which:0, n_codes0:0, n_codes1:n_lit, base_symbol:257) @@ -463,13 +463,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 error "internal error: inconsistent Huffman decoder state" + return error "?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 error "no Huffman codes" + return error "?no Huffman codes" } // Check that the Huffman code completely covers all possible input bits. @@ -477,19 +477,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 error "internal error: inconsistent Huffman decoder state" + return error "?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 error "bad Huffman code (over-subscribed)" + return error "?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 error "bad Huffman code (under-subscribed)" + return error "?bad Huffman code (under-subscribed)" } // Calculate offsets and n_symbols. @@ -511,7 +511,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 error "internal error: inconsistent Huffman decoder state" + return error "?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 @@ -520,7 +520,7 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c i += 1 } if n_symbols > 288 { - return error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } // Calculate symbols. @@ -549,11 +549,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 error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } if this.code_lengths[i] != 0 { if offsets[this.code_lengths[i]] >= 320 { - return error "internal error: inconsistent Huffman decoder state" + return error "?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 @@ -574,7 +574,7 @@ pri func decoder.init_huff!??(which base.u32[..1], n_codes0 base.u32[..320], n_c break } if min_cl >= 9 { - return error "bad Huffman minimum code length" + return error "?bad Huffman minimum code length" } min_cl += 1 } @@ -587,7 +587,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 error "no Huffman codes" + return error "?no Huffman codes" } max_cl -= 1 } @@ -612,10 +612,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 error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } if (args.n_codes0 + (symbols[0] as base.u32)) >= 320 { - return error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } var initial_high_bits base.u32 = 1 << 9 @@ -635,13 +635,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 error "internal error: inconsistent Huffman decoder state" + return error "?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 error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } } // For the remainder of this loop body, prev_cl is the original code @@ -676,20 +676,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 error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } remaining <<= 1 j += 1 } if (j <= 9) or (15 < j) { - return error "internal error: inconsistent Huffman decoder state" + return error "?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 error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } next_top = top + ((1 as base.u32) << tmp) @@ -698,7 +698,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 error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } counts[prev_cl] -= 1 @@ -721,7 +721,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 error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } // The table uses log2(initial_high_bits) bits, but reversed_key only @@ -736,7 +736,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 error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } this.huffs[args.which][top + ((high_bits | reversed_key) & 511)] = value } @@ -748,7 +748,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 error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } } } diff --git a/std/deflate/decode_huffman_fast.wuffs b/std/deflate/decode_huffman_fast.wuffs index da92f921..fad1fcc4 100644 --- a/std/deflate/decode_huffman_fast.wuffs +++ b/std/deflate/decode_huffman_fast.wuffs @@ -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 error "internal error: inconsistent n_bits" + return error "?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 error "internal error: inconsistent Huffman decoder state" + return error "?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 error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } else if (table_entry >> 27) != 0 { - return error "bad Huffman code" + return error "?bad Huffman code" } else { - return error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } // Once again, redundant but explicit assertions. assert args.src.available() >= 8 } else if (table_entry >> 27) != 0 { - return error "bad Huffman code" + return error "?bad Huffman code" } else { - return error "internal error: inconsistent Huffman decoder state" + return error "?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 error "internal error: inconsistent Huffman decoder state" + return error "?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 error "internal error: inconsistent Huffman decoder state" + return error "?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 error "bad Huffman code" + return error "?bad Huffman code" } - return error "internal error: inconsistent Huffman decoder state" + return error "?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 error "internal error: inconsistent Huffman decoder state" + return error "?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 error "bad distance" + return error "?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 error "internal error: inconsistent distance" + return error "?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 error "internal error: inconsistent I/O" + return error "?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 error "internal error: inconsistent n_bits" + return error "?internal error: inconsistent n_bits" } } diff --git a/std/deflate/decode_huffman_slow.wuffs b/std/deflate/decode_huffman_slow.wuffs index eb06be6c..27dcdcd5 100644 --- a/std/deflate/decode_huffman_slow.wuffs +++ b/std/deflate/decode_huffman_slow.wuffs @@ -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 error "internal error: inconsistent n_bits" + return error "?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 error "internal error: inconsistent Huffman decoder state" + return error "?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 error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } else if (table_entry >> 27) != 0 { - return error "bad Huffman code" + return error "?bad Huffman code" } else { - return error "internal error: inconsistent Huffman decoder state" + return error "?internal error: inconsistent Huffman decoder state" } } else if (table_entry >> 27) != 0 { - return error "bad Huffman code" + return error "?bad Huffman code" } else { - return error "internal error: inconsistent Huffman decoder state" + return error "?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 error "internal error: inconsistent Huffman decoder state" + return error "?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 error "bad Huffman code" + return error "?bad Huffman code" } - return error "internal error: inconsistent Huffman decoder state" + return error "?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 error "bad distance" + return error "?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 suspension "short write" + yield suspension "$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 suspension "short write" + yield suspension "$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 suspension "short write" + yield suspension "$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 error "internal error: inconsistent n_bits" + return error "?internal error: inconsistent n_bits" } } diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 780640f0..bda66276 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -16,15 +16,15 @@ packageid "gif " use "std/lzw" -pub error (0x01) "bad block" -pub error (0x02) "bad extension label" -pub error (0x03) "bad graphic control" -pub error (0x04) "bad header" -pub error (0x05) "bad literal width" -pub error (0x06) "not enough pixel data" -pub error (0x07) "too much pixel data" +pub error (0x01) "?bad block" +pub error (0x02) "?bad extension label" +pub error (0x03) "?bad graphic control" +pub error (0x04) "?bad header" +pub error (0x05) "?bad literal width" +pub error (0x06) "?not enough pixel data" +pub error (0x07) "?too much pixel data" -pri error (0x40) "internal error: inconsistent ri/wi" +pri error (0x40) "?internal error: inconsistent ri/wi" // See the spec appendix E "Interlaced Images" on page 29. The first element // represents either that the frame was non-interlaced, or that all interlace @@ -124,7 +124,7 @@ pub struct decoder?( pub func decoder.decode_image_config!??(dst nptr base.image_config, src base.io_reader) { if this.call_sequence >= 1 { - return error "invalid call sequence" + return error "?invalid call sequence" } this.decode_header!??(src:args.src) this.decode_lsd!??(src:args.src) @@ -184,7 +184,7 @@ pub func decoder.decode_frame_config!??(dst nptr base.frame_config, src base.io_ // this.end_of_data. if this.end_of_data { while true { - yield suspension "end of data" + yield suspension "$end of data" } } @@ -263,7 +263,7 @@ pri func decoder.decode_up_to_id_part1!??(src base.io_reader) { this.end_of_data = true break } else { - return error "bad block" + return error "?bad block" } } } @@ -280,7 +280,7 @@ pri func decoder.decode_header!??(src base.io_reader) { } if (c[0] != 0x47) or (c[1] != 0x49) or (c[2] != 0x46) or (c[3] != 0x38) or ((c[4] != 0x37) and (c[4] != 0x39)) or (c[5] != 0x61) { - return error "bad header" + return error "?bad header" } } @@ -432,11 +432,11 @@ pri func decoder.decode_ae!??(src base.io_reader) { // decode_gc reads a Graphic Control. pri func decoder.decode_gc!??(src base.io_reader) { if this.seen_graphic_control { - return error "bad graphic control" + return error "?bad graphic control" } var c base.u8 = args.src.read_u8!??() if c != 4 { - return error "bad graphic control" + return error "?bad graphic control" } var flags base.u8 = args.src.read_u8!??() @@ -466,7 +466,7 @@ pri func decoder.decode_gc!??(src base.io_reader) { c = args.src.read_u8!??() if c != 0 { - return error "bad graphic control" + return error "?bad graphic control" } this.seen_graphic_control = true } @@ -569,7 +569,7 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade var lw base.u8 = args.src.read_u8!??() if (lw < 2) or (8 < lw) { - return error "bad literal width" + return error "?bad literal width" } this.lzw.set_literal_width!(lw:lw as base.u32) @@ -598,17 +598,17 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade block_size ~sat-= args.src.since_mark().length() } - if z.is_ok() or (z == suspension "short write") { + if z.is_ok() or (z == suspension "$short write") { this.copy_to_image_buffer!??(pb:args.dst) - if z == suspension "short write" { + if z == suspension "$short write" { continue:inner } // TODO: check that block_size is zero? this.previous_lzw_decode_ended_abruptly = false break:inner } - if (block_size == 0) and (z == suspension "short read") { + if (block_size == 0) and (z == suspension "$short read") { break:inner } yield z @@ -637,7 +637,7 @@ pri func decoder.copy_to_image_buffer!??(pb ptr base.pixel_buffer) { src = this.uncompressed[this.uncompressed_ri:this.uncompressed_wi] if this.dst_y >= this.frame_rect_y1 { - return error "too much pixel data" + return error "?too much pixel data" } // First, copy from src to that part of the frame rect that is inside @@ -672,7 +672,7 @@ pri func decoder.copy_to_image_buffer!??(pb ptr base.pixel_buffer) { if this.uncompressed_wi == this.uncompressed_ri { break } else if this.uncompressed_wi < this.uncompressed_ri { - return error "internal error: inconsistent ri/wi" + return error "?internal error: inconsistent ri/wi" } // Second, skip over src for that part of the frame rect that is @@ -697,7 +697,7 @@ pri func decoder.copy_to_image_buffer!??(pb ptr base.pixel_buffer) { } if this.uncompressed_ri != this.uncompressed_wi { - return error "internal error: inconsistent ri/wi" + return error "?internal error: inconsistent ri/wi" } break } diff --git a/std/gzip/decode_gzip.wuffs b/std/gzip/decode_gzip.wuffs index d32e2f61..4e93686f 100644 --- a/std/gzip/decode_gzip.wuffs +++ b/std/gzip/decode_gzip.wuffs @@ -17,10 +17,10 @@ packageid "gzip" use "std/crc32" use "std/deflate" -pub error (0x01) "bad checksum" -pub error (0x02) "bad compression method" -pub error (0x03) "bad encoding flags" -pub error (0x04) "bad header" +pub error (0x01) "?bad checksum" +pub error (0x02) "?bad compression method" +pub error (0x03) "?bad encoding flags" +pub error (0x04) "?bad header" pub struct decoder?( flate deflate.decoder, @@ -36,15 +36,15 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) { // Read the header. var c base.u8 = args.src.read_u8!??() if c != 0x1F { - return error "bad header" + return error "?bad header" } c = args.src.read_u8!??() if c != 0x8B { - return error "bad header" + return error "?bad header" } c = args.src.read_u8!??() if c != 0x08 { - return error "bad compression method" + return error "?bad compression method" } var flags base.u8 = args.src.read_u8!??() // TODO: API for returning the header's MTIME field. @@ -87,7 +87,7 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) { // Reserved flags bits must be zero. if (flags & 0xE0) != 0 { - return error "bad encoding flags" + return error "?bad encoding flags" } // Decode and checksum the DEFLATE-encoded payload. @@ -109,6 +109,6 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) { var decoded_length_want base.u32 = args.src.read_u32le!??() if (not this.ignore_checksum) and ((checksum_got != checksum_want) or (decoded_length_got != decoded_length_want)) { - return error "bad checksum" + return error "?bad checksum" } } diff --git a/std/lzw/decode_lzw.wuffs b/std/lzw/decode_lzw.wuffs index de79cc63..8f4672ae 100644 --- a/std/lzw/decode_lzw.wuffs +++ b/std/lzw/decode_lzw.wuffs @@ -14,8 +14,8 @@ packageid "lzw " -pub error (0x01) "bad code" -pub error (0x02) "cyclical prefix chain" +pub error (0x01) "?bad code" +pub error (0x02) "?cyclical prefix chain" pub struct decoder?( literal_width base.u32[..8], @@ -102,7 +102,7 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) { { this.stack[s] = this.suffixes[c] if s == 0 { - return error "cyclical prefix chain" + return error "?cyclical prefix chain" } s -= 1 c = this.prefixes[c] as base.u32 @@ -123,7 +123,7 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) { break } s = (s + ((n_copied & 4095) as base.u32)) & 4095 - yield suspension "short write" + yield suspension "$short write" } if save_code <= 4095 { @@ -137,7 +137,7 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) { } } else { - return error "bad code" + return error "?bad code" } } } diff --git a/std/zlib/decode_zlib.wuffs b/std/zlib/decode_zlib.wuffs index 0779631e..e9300748 100644 --- a/std/zlib/decode_zlib.wuffs +++ b/std/zlib/decode_zlib.wuffs @@ -17,12 +17,12 @@ packageid "zlib" use "std/adler32" use "std/deflate" -pub error (0x01) "bad checksum" -pub error (0x02) "bad compression method" -pub error (0x03) "bad compression window size" -pub error (0x04) "bad parity check" +pub error (0x01) "?bad checksum" +pub error (0x02) "?bad compression method" +pub error (0x03) "?bad compression window size" +pub error (0x04) "?bad parity check" -pri error (0x40) "TODO: unsupported preset dictionary" +pri error (0x40) "?TODO: unsupported preset dictionary" pub struct decoder?( flate deflate.decoder, @@ -37,16 +37,16 @@ pub func decoder.set_ignore_checksum!(ic base.bool) { pub func decoder.decode!??(dst base.io_writer, src base.io_reader) { var x base.u16 = args.src.read_u16be!??() if ((x >> 8) & 0x0F) != 0x08 { - return error "bad compression method" + return error "?bad compression method" } if (x >> 12) > 0x07 { - return error "bad compression window size" + return error "?bad compression window size" } if (x & 0x20) != 0 { - return error "TODO: unsupported preset dictionary" + return error "?TODO: unsupported preset dictionary" } if (x % 31) != 0 { - return error "bad parity check" + return error "?bad parity check" } // Decode and checksum the DEFLATE-encoded payload. @@ -64,6 +64,6 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) { } var checksum_want base.u32 = args.src.read_u32be!??() if (not this.ignore_checksum) and (checksum_got != checksum_want) { - return error "bad checksum" + return error "?bad checksum" } } diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 20865939..c71f44db 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -153,7 +153,7 @@ void test_basic_status_is_error() { void test_basic_status_strings() { CHECK_FOCUS(__func__); const char* s0 = wuffs_gif__status__string(WUFFS_BASE__STATUS_OK); - const char* t0 = "?base: ok"; + const char* t0 = "+base: ok"; if (strcmp(s0, t0)) { FAIL("got \"%s\", want \"%s\"", s0, t0); return;