Rename the code_length_code_lengths field.

This commit is contained in:
Nigel Tao committed 2017-07-21 10:09:44 +10:00
1 parent fc74e7e83a
commit 4b7a350a68
4 files changed
+15 -17

No files matched your search

+3 -5
View File
@@ -136,7 +136,7 @@ typedef struct {
uint32_t f_bits;
uint32_t f_n_bits;
uint8_t f_code_length_code_lengths[19];
uint8_t f_code_lengths[19];
uint32_t f_wip0;
uint32_t f_wip1;
@@ -703,16 +703,14 @@ puffs_flate_status puffs_flate_decoder_decode_dynamic(
v_bits |= (((uint32_t)(t_1)) << v_n_bits);
v_n_bits += 8;
}
self->private_impl
.f_code_length_code_lengths[puffs_flate_code_order[v_i]] =
self->private_impl.f_code_lengths[puffs_flate_code_order[v_i]] =
((uint8_t)((v_bits & 7)));
v_bits >>= 3;
v_n_bits -= 3;
v_i += 1;
}
while (v_i < 19) {
self->private_impl
.f_code_length_code_lengths[puffs_flate_code_order[v_i]] = 0;
self->private_impl.f_code_lengths[puffs_flate_code_order[v_i]] = 0;
v_i += 1;
}
self->private_impl.f_wip0 = v_hlit;
+1 -1
View File
@@ -136,7 +136,7 @@ typedef struct {
uint32_t f_bits;
uint32_t f_n_bits;
uint8_t f_code_length_code_lengths[19];
uint8_t f_code_lengths[19];
uint32_t f_wip0;
uint32_t f_wip1;
+3 -3
View File
@@ -19,7 +19,7 @@ pub struct decoder?(
bits u32,
n_bits u32,
code_length_code_lengths[19] u8[..7],
code_lengths[19] u8[..7],
// These temporary fields are used to debug work-in-progress code.
wip0 u32,
@@ -103,13 +103,13 @@ pri func decoder.decode_dynamic?(dst writer1, src reader1)() {
n_bits += 8
}
assert i < 19 via "a < b: a < c; c <= b"(c:hclen)
this.code_length_code_lengths[code_order[i]] = (bits & 0x07) as u8
this.code_lengths[code_order[i]] = (bits & 0x07) as u8
bits >>= 3
n_bits -= 3
i += 1
}
while i < 19 {
this.code_length_code_lengths[code_order[i]] = 0
this.code_lengths[code_order[i]] = 0
i += 1
}
+8 -8
View File
@@ -237,24 +237,24 @@ void test_puffs_flate_work_in_progress() {
return;
}
if (dec.private_impl.f_code_length_code_lengths[16] != 0) {
if (dec.private_impl.f_code_lengths[16] != 0) {
FAIL("clcl[16]: got %" PRIu8 ", want %" PRIu8,
dec.private_impl.f_code_length_code_lengths[16], 0);
dec.private_impl.f_code_lengths[16], 0);
return;
}
if (dec.private_impl.f_code_length_code_lengths[17] != 4) {
if (dec.private_impl.f_code_lengths[17] != 4) {
FAIL("clcl[17]: got %" PRIu8 ", want %" PRIu8,
dec.private_impl.f_code_length_code_lengths[17], 4);
dec.private_impl.f_code_lengths[17], 4);
return;
}
if (dec.private_impl.f_code_length_code_lengths[18] != 5) {
if (dec.private_impl.f_code_lengths[18] != 5) {
FAIL("clcl[18]: got %" PRIu8 ", want %" PRIu8,
dec.private_impl.f_code_length_code_lengths[18], 5);
dec.private_impl.f_code_lengths[18], 5);
return;
}
if (dec.private_impl.f_code_length_code_lengths[3] != 5) {
if (dec.private_impl.f_code_lengths[3] != 5) {
FAIL("clcl[3]: got %" PRIu8 ", want %" PRIu8,
dec.private_impl.f_code_length_code_lengths[3], 5);
dec.private_impl.f_code_lengths[3], 5);
return;
}
}