mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 08:47:28 +01:00
Rename [i..j] to [i ..= j], the same as Rust
This commit is contained in:
1 parent
18c6e5716a
commit
d501daddc3
18 files changed
+219
-206
No files matched your search
@@ -13,7 +13,7 @@
|
||||
// limitations under the License.
|
||||
|
||||
// code_order is defined in the RFC section 3.2.7.
|
||||
pri const code_order array[19] base.u8[..18] = [
|
||||
pri const code_order array[19] base.u8[..= 18] = [
|
||||
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15,
|
||||
]
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ pub struct decoder?(
|
||||
history_index base.u32,
|
||||
|
||||
// n_huffs_bits is discussed in the huffs field comment.
|
||||
n_huffs_bits array[2] base.u32[..9],
|
||||
n_huffs_bits array[2] base.u32[..= 9],
|
||||
|
||||
// end_of_block is whether decode_huffman_xxx saw an end-of-block code.
|
||||
//
|
||||
@@ -99,17 +99,19 @@ pub struct decoder?(
|
||||
// less, then more source bytes are read and the table lookup re-tried.
|
||||
//
|
||||
// The table value's bits:
|
||||
// - bit 31 indicates a literal.
|
||||
// - bit 30 indicates a base number + extra bits.
|
||||
// - bit 29 indicates end-of-block.
|
||||
// - bit 28 indicates a redirect to another part of the table.
|
||||
// - bit 27 indicates an invalid value.
|
||||
// - bits 26 .. 24 are zero.
|
||||
// - bits 23 .. 8 are the redirect offset, literal (in bits 15-8) or base number.
|
||||
// - bits 7 .. 4 are the redirected table's bits or number of extra bits.
|
||||
// - bits 3 .. 0 are the number of decoder.bits to consume.
|
||||
// - bit 31 indicates a literal.
|
||||
// - bit 30 indicates a base number + extra bits.
|
||||
// - bit 29 indicates end-of-block.
|
||||
// - bit 28 indicates a redirect to another part of the table.
|
||||
// - bit 27 indicates an invalid value.
|
||||
// - bits 24 ..= 26 are zero.
|
||||
// - bits 8 ..= 23 are the redirect offset, literal (in bits [8 ..= 15])
|
||||
// or base number.
|
||||
// - bits 4 ..= 7 are the redirected table's size in bits or the number
|
||||
// of extra bits.
|
||||
// - bits 0 ..= 3 are the number of decoder.bits to consume.
|
||||
//
|
||||
// Exactly one of the eight bits 31-24 should be set.
|
||||
// Exactly one of the eight bits [24 ..= 31] should be set.
|
||||
huffs array[2] array[huffs_table_size] base.u32,
|
||||
|
||||
// history holds up to the last 32KiB of decoded output, if the decoding
|
||||
@@ -135,7 +137,7 @@ pub struct decoder?(
|
||||
pub func decoder.add_history!(hist slice base.u8) {
|
||||
var s slice base.u8
|
||||
var n_copied base.u64
|
||||
var already_full base.u32[..0x8000]
|
||||
var already_full base.u32[..= 0x8000]
|
||||
|
||||
s = args.hist
|
||||
if s.length() >= 0x8000 {
|
||||
@@ -201,7 +203,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb
|
||||
|
||||
pri func decoder.decode_blocks?(dst base.io_writer, src base.io_reader) {
|
||||
var final base.u32
|
||||
var b0 base.u32[..255]
|
||||
var b0 base.u32[..= 255]
|
||||
var type base.u32
|
||||
var status base.status
|
||||
|
||||
@@ -330,21 +332,21 @@ pri func decoder.init_fixed_huffman!() base.status {
|
||||
pri func decoder.init_dynamic_huffman?(src base.io_reader) {
|
||||
var bits base.u32
|
||||
var n_bits base.u32
|
||||
var b0 base.u32[..255]
|
||||
var n_lit base.u32[..288]
|
||||
var n_dist base.u32[..32]
|
||||
var n_clen base.u32[..19]
|
||||
var b0 base.u32[..= 255]
|
||||
var n_lit base.u32[..= 288]
|
||||
var n_dist base.u32[..= 32]
|
||||
var n_clen base.u32[..= 19]
|
||||
var i base.u32
|
||||
var b1 base.u32[..255]
|
||||
var b1 base.u32[..= 255]
|
||||
var status base.status
|
||||
var mask base.u32[..511]
|
||||
var mask base.u32[..= 511]
|
||||
var table_entry base.u32
|
||||
var table_entry_n_bits base.u32[..15]
|
||||
var b2 base.u32[..255]
|
||||
var n_extra_bits base.u32[..7]
|
||||
var rep_symbol base.u8[..15]
|
||||
var table_entry_n_bits base.u32[..= 15]
|
||||
var b2 base.u32[..= 255]
|
||||
var n_extra_bits base.u32[..= 7]
|
||||
var rep_symbol base.u8[..= 15]
|
||||
var rep_count base.u32
|
||||
var b3 base.u32[..255]
|
||||
var b3 base.u32[..= 255]
|
||||
|
||||
bits = this.bits
|
||||
n_bits = this.n_bits
|
||||
@@ -504,29 +506,29 @@ pri func decoder.init_dynamic_huffman?(src base.io_reader) {
|
||||
|
||||
// TODO: make named constants for 15, 19, 319, etc.
|
||||
|
||||
pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..288], n_codes1 base.u32[..320], base_symbol base.u32) base.status {
|
||||
var counts array[16] base.u16[..320]
|
||||
pri func decoder.init_huff!(which base.u32[..= 1], n_codes0 base.u32[..= 288], n_codes1 base.u32[..= 320], base_symbol base.u32) base.status {
|
||||
var counts array[16] base.u16[..= 320]
|
||||
var i base.u32
|
||||
var remaining base.u32
|
||||
var offsets array[16] base.u16[..320]
|
||||
var n_symbols base.u32[..320]
|
||||
var count base.u32[..320]
|
||||
var symbols array[320] base.u16[..319]
|
||||
var min_cl base.u32[..9]
|
||||
var max_cl base.u32[..15]
|
||||
var offsets array[16] base.u16[..= 320]
|
||||
var n_symbols base.u32[..= 320]
|
||||
var count base.u32[..= 320]
|
||||
var symbols array[320] base.u16[..= 319]
|
||||
var min_cl base.u32[..= 9]
|
||||
var max_cl base.u32[..= 15]
|
||||
var initial_high_bits base.u32
|
||||
var prev_cl base.u32[..15]
|
||||
var prev_cl base.u32[..= 15]
|
||||
var prev_redirect_key base.u32
|
||||
var top base.u32[..huffs_table_size]
|
||||
var next_top base.u32[..huffs_table_size]
|
||||
var top base.u32[..= huffs_table_size]
|
||||
var next_top base.u32[..= huffs_table_size]
|
||||
var code base.u32
|
||||
var key base.u32
|
||||
var value base.u32
|
||||
var cl base.u32[..15]
|
||||
var redirect_key base.u32[..511]
|
||||
var j base.u32[..16]
|
||||
var reversed_key base.u32[..511]
|
||||
var symbol base.u32[..319]
|
||||
var cl base.u32[..= 15]
|
||||
var redirect_key base.u32[..= 511]
|
||||
var j base.u32[..= 16]
|
||||
var reversed_key base.u32[..= 511]
|
||||
var symbol base.u32[..= 319]
|
||||
var high_bits base.u32
|
||||
var delta base.u32
|
||||
|
||||
|
||||
@@ -23,15 +23,15 @@ pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) ba
|
||||
var bits base.u32
|
||||
var n_bits base.u32
|
||||
var table_entry base.u32
|
||||
var table_entry_n_bits base.u32[..15]
|
||||
var lmask base.u32[..511]
|
||||
var dmask base.u32[..511]
|
||||
var redir_top base.u32[..0xFFFF]
|
||||
var redir_mask base.u32[..0x7FFF]
|
||||
var length base.u32[..258]
|
||||
var dist_minus_1 base.u32[..0x7FFF]
|
||||
var table_entry_n_bits base.u32[..= 15]
|
||||
var lmask base.u32[..= 511]
|
||||
var dmask base.u32[..= 511]
|
||||
var redir_top base.u32[..= 0xFFFF]
|
||||
var redir_mask base.u32[..= 0x7FFF]
|
||||
var length base.u32[..= 258]
|
||||
var dist_minus_1 base.u32[..= 0x7FFF]
|
||||
var n_copied base.u32
|
||||
var hlen base.u32[..0x7FFF]
|
||||
var hlen base.u32[..= 0x7FFF]
|
||||
var hdist base.u32
|
||||
|
||||
if (this.n_bits >= 8) or ((this.bits >> (this.n_bits & 7)) <> 0) {
|
||||
|
||||
@@ -16,21 +16,21 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) {
|
||||
var bits base.u32
|
||||
var n_bits base.u32
|
||||
var table_entry base.u32
|
||||
var table_entry_n_bits base.u32[..15]
|
||||
var lmask base.u32[..511]
|
||||
var dmask base.u32[..511]
|
||||
var b0 base.u32[..255]
|
||||
var redir_top base.u32[..0xFFFF]
|
||||
var redir_mask base.u32[..0x7FFF]
|
||||
var b1 base.u32[..255]
|
||||
var length base.u32[..258]
|
||||
var b2 base.u32[..255]
|
||||
var b3 base.u32[..255]
|
||||
var b4 base.u32[..255]
|
||||
var dist_minus_1 base.u32[..0x7FFF]
|
||||
var b5 base.u32[..255]
|
||||
var table_entry_n_bits base.u32[..= 15]
|
||||
var lmask base.u32[..= 511]
|
||||
var dmask base.u32[..= 511]
|
||||
var b0 base.u32[..= 255]
|
||||
var redir_top base.u32[..= 0xFFFF]
|
||||
var redir_mask base.u32[..= 0x7FFF]
|
||||
var b1 base.u32[..= 255]
|
||||
var length base.u32[..= 258]
|
||||
var b2 base.u32[..= 255]
|
||||
var b3 base.u32[..= 255]
|
||||
var b4 base.u32[..= 255]
|
||||
var dist_minus_1 base.u32[..= 0x7FFF]
|
||||
var b5 base.u32[..= 255]
|
||||
var n_copied base.u32
|
||||
var hlen base.u32[..0x7FFF]
|
||||
var hlen base.u32[..= 0x7FFF]
|
||||
var hdist base.u32
|
||||
|
||||
// When editing this function, consider making the equivalent change to the
|
||||
|
||||
Reference in new issue
Block a user