Rename u32, io_reader, etc to base.u32, etc

This commit is contained in:
Nigel Tao committed 2018-04-12 21:49:17 +10:00
1 parent fee97df698
commit f95239f6e0
24 files changed
+394 -392

No files matched your search

+13 -13
View File
@@ -25,14 +25,14 @@ pub error "invalid gzip encoding flags"
pub struct decoder?(
flate deflate.decoder,
checksum crc32.ieee,
ignore_checksum bool,
ignore_checksum base.bool,
)
pub func decoder.set_ignore_checksum!(ic bool)() {
pub func decoder.set_ignore_checksum!(ic base.bool)() {
this.ignore_checksum = in.ic
}
pub func decoder.decode?(dst io_writer, src io_reader)() {
pub func decoder.decode?(dst base.io_writer, src base.io_reader)() {
// Read the header.
if in.src.read_u8?() != 0x1F {
return error "bad gzip header"
@@ -43,15 +43,15 @@ pub func decoder.decode?(dst io_writer, src io_reader)() {
if in.src.read_u8?() != 0x08 {
return error "invalid gzip compression method"
}
var flags u8 = in.src.read_u8?()
var flags base.u8 = in.src.read_u8?()
// TODO: API for returning the header's MTIME field.
in.src.skip32?(n:6)
var c u8
var c base.u8
// Handle FEXTRA.
if (flags & 0x04) != 0 {
var xlen u16 = in.src.read_u16le?()
in.src.skip32?(n:xlen as u32)
var xlen base.u16 = in.src.read_u16le?()
in.src.skip32?(n:xlen as base.u32)
}
// Handle FNAME.
@@ -89,23 +89,23 @@ pub func decoder.decode?(dst io_writer, src io_reader)() {
}
// Decode and checksum the DEFLATE-encoded payload.
var checksum_got u32
var decoded_length_got u32
var checksum_got base.u32
var decoded_length_got base.u32
while true {
in.dst.mark()
var z status = try this.flate.decode?(dst:in.dst, src:in.src)
var z base.status = try this.flate.decode?(dst:in.dst, src:in.src)
if not this.ignore_checksum {
checksum_got = this.checksum.update(x:in.dst.since_mark())
decoded_length_got = decoded_length_got ~+
((in.dst.since_mark().length() & 0xFFFFFFFF) as u32)
((in.dst.since_mark().length() & 0xFFFFFFFF) as base.u32)
}
if z.is_ok() {
break
}
yield z
}
var checksum_want u32 = in.src.read_u32le?()
var decoded_length_want u32 = in.src.read_u32le?()
var checksum_want base.u32 = in.src.read_u32le?()
var decoded_length_want base.u32 = in.src.read_u32le?()
if (not this.ignore_checksum) and
((checksum_got != checksum_want) or (decoded_length_got != decoded_length_want)) {
return error "checksum mismatch"