Change "$foo" to base."$foo"

This commit is contained in:
Nigel Tao committed 2018-11-24 13:36:09 +11:00
1 parent 875362ea07
commit 9e5aec5d25
11 files changed
+71 -59

No files matched your search

+2 -2
View File
@@ -235,9 +235,9 @@ pri func decoder.decode_uncompressed!??(dst base.io_writer, src base.io_reader)
}
length -= n_copied
if args.dst.available() == 0 {
yield "$short write"
yield base."$short write"
} else {
yield "$short read"
yield base."$short read"
}
}
}
+3 -3
View File
@@ -220,7 +220,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
break
}
}
yield "$short write"
yield base."$short write"
}
// Copy from the start of this.history, if we wrapped around.
if hlen > 0 {
@@ -233,7 +233,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
}
hlen -= n_copied
hdist ~mod+= n_copied
yield "$short write"
yield base."$short write"
}
}
@@ -250,7 +250,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
break
}
length -= n_copied
yield "$short write"
yield base."$short write"
}
}
+7 -7
View File
@@ -120,7 +120,7 @@ pub struct decoder?(
pub func decoder.decode_image_config!??(dst nptr base.image_config, src base.io_reader) {
if this.call_sequence >= 1 {
return "?bad call sequence"
return base."?bad call sequence"
}
this.dirty_y.reset!()
@@ -187,7 +187,7 @@ pub func decoder.workbuf_len() base.range_ii_u64 {
pub func decoder.restart_frame!??(index base.u64, io_position base.u64) {
if this.call_sequence == 0 {
return "?bad call sequence"
return base."?bad call sequence"
}
this.end_of_data = false
this.restarted = true
@@ -212,7 +212,7 @@ pub func decoder.decode_frame_config!??(dst nptr base.frame_config, src base.io_
// This is a new "if", not an "else", because the calls above can modify
// this.end_of_data.
if this.end_of_data {
return "~end of data"
return base."~end of data"
}
var blend base.u8 = 0
@@ -255,7 +255,7 @@ pri func decoder.skip_frame!??(src base.io_reader) {
// TODO: honor args.opts.
pub func decoder.decode_frame!??(dst ptr base.pixel_buffer, src base.io_reader, workbuf slice base.u8, opts nptr base.decode_frame_options) {
if args.workbuf.length() < (this.width as base.u64) {
return "?bad workbuf length"
return base."?bad workbuf length"
}
if this.call_sequence != 2 {
this.decode_frame_config!??(dst:nullptr, src:args.src)
@@ -281,7 +281,7 @@ pri func decoder.decode_up_to_id_part1!??(src base.io_reader) {
if not this.restarted {
this.frame_config_io_position = args.src.position()
} else if this.frame_config_io_position != args.src.position() {
return "?bad restart"
return base."?bad restart"
} else {
this.restarted = false
}
@@ -634,7 +634,7 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade
block_size ~sat-= args.src.since_mark().length()
}
if (block_size == 0) and (z == "$short read") {
if (block_size == 0) and (z == base."$short read") {
break:inner
}
@@ -647,7 +647,7 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade
this.previous_lzw_decode_ended_abruptly = false
break:inner
}
if z == "$short write" {
if z == base."$short write" {
continue:inner
}
yield z
+2 -2
View File
@@ -90,7 +90,7 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
this.flush!??(dst:args.dst)
j = 0
}
yield "$short read"
yield base."$short read"
}
bits |= (args.src.peek_u8() as base.u32) << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
@@ -259,6 +259,6 @@ pri func decoder.flush!??(dst base.io_writer) {
return
}
i = (i + ((n & 8191) as base.u32)) & 8191
yield "$short write"
yield base."$short write"
}
}