Use peek_uxx_as_uyy more often

This commit is contained in:
Nigel Tao committed 2018-12-23 09:12:56 +11:00
1 parent 86a96969cc
commit 2f4c931b42
3 files changed
+15 -16

No files matched your search

+12 -12
View File
@@ -63,10 +63,10 @@ pri func decoder.decode_huffman_fast!?(dst base.io_writer, src base.io_reader) {
// Ensure that we have at least 15 bits of input.
if n_bits < 15 {
assert n_bits >= 0 // TODO: this shouldn't be necessary.
bits |= (args.src.peek_u8() as base.u32) << n_bits
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
bits |= (args.src.peek_u8() as base.u32) << n_bits
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
assert n_bits >= 15
@@ -102,10 +102,10 @@ pri func decoder.decode_huffman_fast!?(dst base.io_writer, src base.io_reader) {
// Ensure that we have at least 15 bits of input.
if n_bits < 15 {
assert n_bits >= 0 // TODO: this shouldn't be necessary.
bits |= (args.src.peek_u8() as base.u32) << n_bits
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
bits |= (args.src.peek_u8() as base.u32) << n_bits
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
assert n_bits >= 15
@@ -163,10 +163,10 @@ pri func decoder.decode_huffman_fast!?(dst base.io_writer, src base.io_reader) {
// Ensure that we have at least 15 bits of input.
if n_bits < 15 {
assert n_bits >= 0 // TODO: this shouldn't be necessary.
bits |= (args.src.peek_u8() as base.u32) << n_bits
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
bits |= (args.src.peek_u8() as base.u32) << n_bits
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
assert n_bits >= 15
@@ -190,10 +190,10 @@ pri func decoder.decode_huffman_fast!?(dst base.io_writer, src base.io_reader) {
// Ensure that we have at least 15 bits of input.
if n_bits < 15 {
assert n_bits >= 0 // TODO: this shouldn't be necessary.
bits |= (args.src.peek_u8() as base.u32) << n_bits
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
bits |= (args.src.peek_u8() as base.u32) << n_bits
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
assert n_bits >= 15
@@ -215,10 +215,10 @@ pri func decoder.decode_huffman_fast!?(dst base.io_writer, src base.io_reader) {
// Ensure that we have at least 15 bits of input.
if n_bits < 15 {
assert n_bits >= 0 // TODO: this shouldn't be necessary.
bits |= (args.src.peek_u8() as base.u32) << n_bits
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
bits |= (args.src.peek_u8() as base.u32) << n_bits
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
assert n_bits >= 15
@@ -262,10 +262,10 @@ pri func decoder.decode_huffman_fast!?(dst base.io_writer, src base.io_reader) {
if n_bits < table_entry_n_bits {
assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits)
assert n_bits >= 0 // TODO: this shouldn't be necessary.
bits |= (args.src.peek_u8() as base.u32) << n_bits
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
bits |= (args.src.peek_u8() as base.u32) << n_bits
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
assert table_entry_n_bits <= n_bits via "a <= b: a <= c; c <= b"(c:16)