Rename io_writer.history_available

This commit is contained in:
Nigel Tao committed 2020-08-13 23:29:59 +10:00
1 parent be8542e313
commit 3c3d58bfe7
6 files changed
+39 -39

No files matched your search

+4 -4
View File
@@ -290,12 +290,12 @@ pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader)
pre args.dst.length() >= 258,
{
// Copy from this.history.
if ((dist_minus_1 + 1) as base.u64) > args.dst.history_available() {
if ((dist_minus_1 + 1) as base.u64) > args.dst.history_length() {
// Set (hlen, hdist) to be the length-distance pair to copy
// from this.history, and (length, distance) to be the
// remaining length-distance pair to copy from args.dst.
hlen = 0
hdist = (((dist_minus_1 + 1) as base.u64) - args.dst.history_available()) as base.u32
hdist = (((dist_minus_1 + 1) as base.u64) - args.dst.history_length()) as base.u32
if length > hdist {
assert hdist < length via "a < b: b > a"()
assert hdist < 0x8000 via "a < b: a < c; c <= b"(c: length)
@@ -325,12 +325,12 @@ pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader)
continue.loop
}
if ((dist_minus_1 + 1) as base.u64) > args.dst.history_available() {
if ((dist_minus_1 + 1) as base.u64) > args.dst.history_length() {
return "#internal error: inconsistent distance"
}
}
// Once again, redundant but explicit assertions.
assert ((dist_minus_1 + 1) as base.u64) <= args.dst.history_available()
assert ((dist_minus_1 + 1) as base.u64) <= args.dst.history_length()
assert args.dst.length() >= 258
// We can therefore prove:
+2 -2
View File
@@ -203,11 +203,11 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
while true {
// Copy from this.history.
if ((dist_minus_1 + 1) as base.u64) > args.dst.history_available() {
if ((dist_minus_1 + 1) as base.u64) > args.dst.history_length() {
// Set (hlen, hdist) to be the length-distance pair to copy
// from this.history, and (length, distance) to be the
// remaining length-distance pair to copy from args.dst.
hdist = (((dist_minus_1 + 1) as base.u64) - args.dst.history_available()) as base.u32
hdist = (((dist_minus_1 + 1) as base.u64) - args.dst.history_length()) as base.u32
if length > hdist {
assert hdist < length via "a < b: b > a"()
assert hdist < 0x8000 via "a < b: a < c; c <= b"(c: length)