mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 08:47:28 +01:00
Rename x T to x: T for fields and func args
This commit is contained in:
1 parent
5b4e3647c0
commit
1520a1f345
15 files changed
+226
-216
No files matched your search
@@ -14,11 +14,11 @@
|
||||
|
||||
// TODO: drop the '?' but still generate wuffs_adler32__hasher__initialize?
|
||||
pub struct hasher?(
|
||||
state base.u32,
|
||||
started base.bool,
|
||||
state : base.u32,
|
||||
started : base.bool,
|
||||
)
|
||||
|
||||
pub func hasher.update!(x slice base.u8) base.u32 {
|
||||
pub func hasher.update!(x: slice base.u8) base.u32 {
|
||||
// The Adler-32 checksum's magic 65521 and 5552 numbers are discussed in
|
||||
// this package's README.md.
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
// TODO: drop the '?' but still generate wuffs_crc32__ieee_hasher__initialize?
|
||||
pub struct ieee_hasher?(
|
||||
state base.u32,
|
||||
state : base.u32,
|
||||
)
|
||||
|
||||
// TODO: should it be ? instead of ! because it's public, and might need a way
|
||||
// to signal "initializer not called"? Should the return type, in the generated
|
||||
// C code, be "struct{ uint32_t checksum; wuffs_crc32__status status }"?
|
||||
pub func ieee_hasher.update!(x slice base.u8) base.u32 {
|
||||
pub func ieee_hasher.update!(x: slice base.u8) base.u32 {
|
||||
var s base.u32
|
||||
var p slice base.u8
|
||||
|
||||
|
||||
@@ -64,21 +64,21 @@ pri const huffs_table_mask base.u32 = 1023
|
||||
|
||||
pub struct decoder?(
|
||||
// These fields yield src's bits in Least Significant Bits order.
|
||||
bits base.u32,
|
||||
n_bits base.u32,
|
||||
bits : base.u32,
|
||||
n_bits : base.u32,
|
||||
|
||||
// history_index indexes the history array, defined below.
|
||||
history_index base.u32,
|
||||
history_index : base.u32,
|
||||
|
||||
// n_huffs_bits is discussed in the huffs field comment.
|
||||
n_huffs_bits array[2] base.u32[..= 9],
|
||||
n_huffs_bits : array[2] base.u32[..= 9],
|
||||
|
||||
// end_of_block is whether decode_huffman_xxx saw an end-of-block code.
|
||||
//
|
||||
// TODO: can decode_huffman_xxx signal this in band instead of out of band?
|
||||
end_of_block base.bool,
|
||||
end_of_block : base.bool,
|
||||
|
||||
util base.utility,
|
||||
util : base.utility,
|
||||
)(
|
||||
// huffs and n_huffs_bits are the lookup tables for Huffman decodings.
|
||||
//
|
||||
@@ -112,7 +112,7 @@ pub struct decoder?(
|
||||
// - bits 0 ..= 3 are the number of decoder.bits to consume.
|
||||
//
|
||||
// Exactly one of the eight bits [24 ..= 31] should be set.
|
||||
huffs array[2] array[huffs_table_size] base.u32,
|
||||
huffs : array[2] array[huffs_table_size] base.u32,
|
||||
|
||||
// history holds up to the last 32KiB of decoded output, if the decoding
|
||||
// was incomplete (e.g. due to a short read or write). RFC 1951 (DEFLATE)
|
||||
@@ -125,16 +125,16 @@ pub struct decoder?(
|
||||
//
|
||||
// history[history_index & 0x7FFF] is where the next byte of decoded output
|
||||
// will be written.
|
||||
history array[0x8000] base.u8, // 32 KiB.
|
||||
history : array[0x8000] base.u8, // 32 KiB.
|
||||
|
||||
// code_lengths is used to pass out-of-band data to init_huff.
|
||||
//
|
||||
// code_lengths[args.n_codes0 + i] holds the number of bits in the i'th
|
||||
// code.
|
||||
code_lengths array[320] base.u8,
|
||||
code_lengths : array[320] base.u8,
|
||||
)
|
||||
|
||||
pub func decoder.add_history!(hist slice base.u8) {
|
||||
pub func decoder.add_history!(hist: slice base.u8) {
|
||||
var s slice base.u8
|
||||
var n_copied base.u64
|
||||
var already_full base.u32[..= 0x8000]
|
||||
@@ -183,7 +183,7 @@ pub func decoder.workbuf_len() base.range_ii_u64 {
|
||||
max_incl: decoder_workbuf_len_max_incl_worst_case)
|
||||
}
|
||||
|
||||
pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) {
|
||||
pub func decoder.decode_io_writer?(dst: base.io_writer, src: base.io_reader, workbuf: slice base.u8) {
|
||||
var mark base.u64
|
||||
var status base.status
|
||||
|
||||
@@ -201,7 +201,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb
|
||||
}
|
||||
}
|
||||
|
||||
pri func decoder.decode_blocks?(dst base.io_writer, src base.io_reader) {
|
||||
pri func decoder.decode_blocks?(dst: base.io_writer, src: base.io_reader) {
|
||||
var final base.u32
|
||||
var b0 base.u32[..= 255]
|
||||
var type base.u32
|
||||
@@ -259,7 +259,7 @@ pri func decoder.decode_blocks?(dst base.io_writer, src base.io_reader) {
|
||||
|
||||
// decode_uncompressed decodes an uncompresed block as per the RFC section
|
||||
// 3.2.4.
|
||||
pri func decoder.decode_uncompressed?(dst base.io_writer, src base.io_reader) {
|
||||
pri func decoder.decode_uncompressed?(dst: base.io_writer, src: base.io_reader) {
|
||||
var length base.u32
|
||||
var n_copied base.u32
|
||||
|
||||
@@ -329,7 +329,7 @@ pri func decoder.init_fixed_huffman!() base.status {
|
||||
}
|
||||
|
||||
// init_dynamic_huffman initializes this.huffs as per the RFC section 3.2.7.
|
||||
pri func decoder.init_dynamic_huffman?(src base.io_reader) {
|
||||
pri func decoder.init_dynamic_huffman?(src: base.io_reader) {
|
||||
var bits base.u32
|
||||
var n_bits base.u32
|
||||
var b0 base.u32[..= 255]
|
||||
@@ -506,7 +506,7 @@ pri func decoder.init_dynamic_huffman?(src base.io_reader) {
|
||||
|
||||
// TODO: make named constants for 15, 19, 319, etc.
|
||||
|
||||
pri func decoder.init_huff!(which base.u32[..= 1], n_codes0 base.u32[..= 288], n_codes1 base.u32[..= 320], base_symbol base.u32) base.status {
|
||||
pri func decoder.init_huff!(which: base.u32[..= 1], n_codes0: base.u32[..= 288], n_codes1: base.u32[..= 320], base_symbol: base.u32) base.status {
|
||||
var counts array[16] base.u16[..= 320]
|
||||
var i base.u32
|
||||
var remaining base.u32
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
// TODO: describe how the xxx_fast version differs from the xxx_slow one, the
|
||||
// assumptions that xxx_fast makes, and how that makes it fast.
|
||||
pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) base.status {
|
||||
pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader) base.status {
|
||||
// When editing this function, consider making the equivalent change to the
|
||||
// decode_huffman_slow function. Keep the diff between the two
|
||||
// decode_huffman_*.wuffs files as small as possible, while retaining both
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) {
|
||||
pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader) {
|
||||
var bits base.u32
|
||||
var n_bits base.u32
|
||||
var table_entry base.u32
|
||||
|
||||
+67
-67
@@ -121,8 +121,8 @@ pri const interlace_delta array[5] base.u8 = [1, 2, 4, 8, 8]
|
||||
pri const interlace_count array[5] base.u8 = [0, 1, 2, 4, 8]
|
||||
|
||||
pub struct decoder?(
|
||||
width base.u32,
|
||||
height base.u32,
|
||||
width : base.u32,
|
||||
height : base.u32,
|
||||
|
||||
// Call sequence states:
|
||||
// - 0: initial state.
|
||||
@@ -159,79 +159,79 @@ pub struct decoder?(
|
||||
// - F is decode_frame, implicit means skip_frame
|
||||
// - FC is decode_frame_config, implicit means nullptr args.dst
|
||||
// - IC is decode_image_config, implicit means nullptr args.dst
|
||||
call_sequence base.u8,
|
||||
call_sequence : base.u8,
|
||||
|
||||
ignore_metadata base.bool,
|
||||
report_metadata_iccp base.bool,
|
||||
report_metadata_xmp base.bool,
|
||||
metadata_fourcc_value base.u32,
|
||||
metadata_chunk_length_value base.u64,
|
||||
metadata_io_position base.u64,
|
||||
ignore_metadata : base.bool,
|
||||
report_metadata_iccp : base.bool,
|
||||
report_metadata_xmp : base.bool,
|
||||
metadata_fourcc_value : base.u32,
|
||||
metadata_chunk_length_value : base.u64,
|
||||
metadata_io_position : base.u64,
|
||||
|
||||
quirk_enabled_delay_num_decoded_frames base.bool,
|
||||
quirk_enabled_first_frame_local_palette_means_black_background base.bool,
|
||||
quirk_enabled_honor_background_color base.bool,
|
||||
quirk_enabled_ignore_too_much_pixel_data base.bool,
|
||||
quirk_enabled_image_bounds_are_strict base.bool,
|
||||
quirk_enabled_reject_empty_frame base.bool,
|
||||
quirk_enabled_reject_empty_palette base.bool,
|
||||
quirk_enabled_delay_num_decoded_frames : base.bool,
|
||||
quirk_enabled_first_frame_local_palette_means_black_background : base.bool,
|
||||
quirk_enabled_honor_background_color : base.bool,
|
||||
quirk_enabled_ignore_too_much_pixel_data : base.bool,
|
||||
quirk_enabled_image_bounds_are_strict : base.bool,
|
||||
quirk_enabled_reject_empty_frame : base.bool,
|
||||
quirk_enabled_reject_empty_palette : base.bool,
|
||||
|
||||
delayed_num_decoded_frames base.bool,
|
||||
end_of_data base.bool,
|
||||
restarted base.bool,
|
||||
previous_lzw_decode_ended_abruptly base.bool,
|
||||
delayed_num_decoded_frames : base.bool,
|
||||
end_of_data : base.bool,
|
||||
restarted : base.bool,
|
||||
previous_lzw_decode_ended_abruptly : base.bool,
|
||||
|
||||
has_global_palette base.bool,
|
||||
has_global_palette : base.bool,
|
||||
|
||||
// interlace indexes the interlace_start and interlace_delta arrays.
|
||||
interlace base.u8[..= 4],
|
||||
interlace : base.u8[..= 4],
|
||||
|
||||
// Absent an ANIMEXTS1.0 or NETSCAPE2.0 extension, the implicit number of
|
||||
// animation loops is 1.
|
||||
seen_num_loops base.bool,
|
||||
num_loops base.u32,
|
||||
seen_num_loops : base.bool,
|
||||
num_loops : base.u32,
|
||||
|
||||
background_color_u32_argb_premul base.u32,
|
||||
black_color_u32_argb_premul base.u32,
|
||||
background_color_u32_argb_premul : base.u32,
|
||||
black_color_u32_argb_premul : base.u32,
|
||||
|
||||
gc_has_transparent_index base.bool,
|
||||
gc_transparent_index base.u8,
|
||||
gc_disposal base.u8,
|
||||
gc_has_transparent_index : base.bool,
|
||||
gc_transparent_index : base.u8,
|
||||
gc_disposal : base.u8,
|
||||
// There are 7056000 flicks per centisecond.
|
||||
gc_duration base.u64[..= 0xFFFF * 7056000],
|
||||
gc_duration : base.u64[..= 0xFFFF * 7056000],
|
||||
|
||||
frame_config_io_position base.u64,
|
||||
num_decoded_frame_configs_value base.u64,
|
||||
num_decoded_frames_value base.u64,
|
||||
frame_config_io_position : base.u64,
|
||||
num_decoded_frame_configs_value : base.u64,
|
||||
num_decoded_frames_value : base.u64,
|
||||
|
||||
frame_rect_x0 base.u32,
|
||||
frame_rect_y0 base.u32,
|
||||
frame_rect_x1 base.u32,
|
||||
frame_rect_y1 base.u32,
|
||||
frame_rect_x0 : base.u32,
|
||||
frame_rect_y0 : base.u32,
|
||||
frame_rect_x1 : base.u32,
|
||||
frame_rect_y1 : base.u32,
|
||||
|
||||
// The dst_etc fields are the output cursor during copy_to_image_buffer.
|
||||
dst_x base.u32,
|
||||
dst_y base.u32,
|
||||
dirty_max_excl_y base.u32,
|
||||
dst_x : base.u32,
|
||||
dst_y : base.u32,
|
||||
dirty_max_excl_y : base.u32,
|
||||
|
||||
// Indexes into the compressed array, defined below.
|
||||
compressed_ri base.u64,
|
||||
compressed_wi base.u64,
|
||||
compressed_ri : base.u64,
|
||||
compressed_wi : base.u64,
|
||||
|
||||
swizzler base.pixel_swizzler,
|
||||
util base.utility,
|
||||
swizzler : base.pixel_swizzler,
|
||||
util : base.utility,
|
||||
)(
|
||||
compressed array[4096] base.u8,
|
||||
compressed : array[4096] base.u8,
|
||||
|
||||
// palettes[0] and palettes[1] are the Global and Local Color Table.
|
||||
palettes array[2] array[4 * 256] base.u8,
|
||||
palettes : array[2] array[4 * 256] base.u8,
|
||||
// dst_palette is the swizzled color table.
|
||||
dst_palette array[4 * 256] base.u8,
|
||||
dst_palette : array[4 * 256] base.u8,
|
||||
|
||||
lzw lzw.decoder,
|
||||
lzw : lzw.decoder,
|
||||
)
|
||||
|
||||
pub func decoder.set_quirk_enabled!(quirk base.u32, enabled base.bool) {
|
||||
pub func decoder.set_quirk_enabled!(quirk: base.u32, enabled: base.bool) {
|
||||
if this.call_sequence == 0 {
|
||||
if args.quirk == quirk_delay_num_decoded_frames {
|
||||
this.quirk_enabled_delay_num_decoded_frames = args.enabled
|
||||
@@ -251,7 +251,7 @@ pub func decoder.set_quirk_enabled!(quirk base.u32, enabled base.bool) {
|
||||
}
|
||||
}
|
||||
|
||||
pub func decoder.decode_image_config?(dst nptr base.image_config, src base.io_reader) {
|
||||
pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_reader) {
|
||||
var ffio base.bool
|
||||
|
||||
if this.call_sequence == 0 {
|
||||
@@ -296,7 +296,7 @@ pub func decoder.decode_image_config?(dst nptr base.image_config, src base.io_re
|
||||
this.call_sequence = 3
|
||||
}
|
||||
|
||||
pub func decoder.set_report_metadata!(fourcc base.u32, report base.bool) {
|
||||
pub func decoder.set_report_metadata!(fourcc: base.u32, report: base.bool) {
|
||||
if args.fourcc == 0x49434350 { // "ICCP"
|
||||
this.report_metadata_iccp = args.report
|
||||
} else if args.fourcc == 0x584D5020 { // "XMP "
|
||||
@@ -304,7 +304,7 @@ pub func decoder.set_report_metadata!(fourcc base.u32, report base.bool) {
|
||||
}
|
||||
}
|
||||
|
||||
pub func decoder.ack_metadata_chunk?(src base.io_reader) {
|
||||
pub func decoder.ack_metadata_chunk?(src: base.io_reader) {
|
||||
if this.call_sequence <> 1 {
|
||||
return base."#bad call sequence"
|
||||
}
|
||||
@@ -383,7 +383,7 @@ pub func decoder.workbuf_len() base.range_ii_u64 {
|
||||
max_incl: decoder_workbuf_len_max_incl_worst_case)
|
||||
}
|
||||
|
||||
pub func decoder.restart_frame!(index base.u64, io_position base.u64) base.status {
|
||||
pub func decoder.restart_frame!(index: base.u64, io_position: base.u64) base.status {
|
||||
if this.call_sequence == 0 {
|
||||
return base."#bad call sequence"
|
||||
}
|
||||
@@ -397,7 +397,7 @@ pub func decoder.restart_frame!(index base.u64, io_position base.u64) base.statu
|
||||
return ok
|
||||
}
|
||||
|
||||
pub func decoder.decode_frame_config?(dst nptr base.frame_config, src base.io_reader) {
|
||||
pub func decoder.decode_frame_config?(dst: nptr base.frame_config, src: base.io_reader) {
|
||||
var blend base.u8
|
||||
var background_color base.u32
|
||||
var flags base.u8
|
||||
@@ -468,7 +468,7 @@ pub func decoder.decode_frame_config?(dst nptr base.frame_config, src base.io_re
|
||||
this.call_sequence = 4
|
||||
}
|
||||
|
||||
pri func decoder.skip_frame?(src base.io_reader) {
|
||||
pri func decoder.skip_frame?(src: base.io_reader) {
|
||||
var flags base.u8
|
||||
var lw base.u8
|
||||
|
||||
@@ -496,7 +496,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) {
|
||||
pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader, workbuf: slice base.u8, opts: nptr base.decode_frame_options) {
|
||||
this.ignore_metadata = true
|
||||
if this.call_sequence <> 4 {
|
||||
this.decode_frame_config?(dst: nullptr, src: args.src)
|
||||
@@ -522,7 +522,7 @@ pri func decoder.reset_gc!() {
|
||||
this.gc_duration = 0
|
||||
}
|
||||
|
||||
pri func decoder.decode_up_to_id_part1?(src base.io_reader) {
|
||||
pri func decoder.decode_up_to_id_part1?(src: base.io_reader) {
|
||||
var block_type base.u8
|
||||
|
||||
if not this.restarted {
|
||||
@@ -562,7 +562,7 @@ pri func decoder.decode_up_to_id_part1?(src base.io_reader) {
|
||||
// decode_header reads either "GIF87a" or "GIF89a".
|
||||
//
|
||||
// See the spec section 17 "Header" on page 7.
|
||||
pri func decoder.decode_header?(src base.io_reader) {
|
||||
pri func decoder.decode_header?(src: base.io_reader) {
|
||||
var c array[6] base.u8
|
||||
var i base.u32
|
||||
|
||||
@@ -579,7 +579,7 @@ pri func decoder.decode_header?(src base.io_reader) {
|
||||
// decode_lsd reads the Logical Screen Descriptor.
|
||||
//
|
||||
// See the spec section 18 "Logical Screen Descriptor" on page 8.
|
||||
pri func decoder.decode_lsd?(src base.io_reader) {
|
||||
pri func decoder.decode_lsd?(src: base.io_reader) {
|
||||
var flags base.u8
|
||||
var background_color_index base.u8
|
||||
var num_palette_entries base.u32[..= 256]
|
||||
@@ -650,7 +650,7 @@ pri func decoder.decode_lsd?(src base.io_reader) {
|
||||
// - section 24 "Comment Extension" on page 17.
|
||||
// - section 25 "Plain Text Extension" on page 18.
|
||||
// - section 26 "Application Extension" on page 21.
|
||||
pri func decoder.decode_extension?(src base.io_reader) {
|
||||
pri func decoder.decode_extension?(src: base.io_reader) {
|
||||
var label base.u8
|
||||
|
||||
label = args.src.read_u8?()
|
||||
@@ -666,7 +666,7 @@ pri func decoder.decode_extension?(src base.io_reader) {
|
||||
this.skip_blocks?(src: args.src)
|
||||
}
|
||||
|
||||
pri func decoder.skip_blocks?(src base.io_reader) {
|
||||
pri func decoder.skip_blocks?(src: base.io_reader) {
|
||||
var block_size base.u8
|
||||
|
||||
while true {
|
||||
@@ -699,7 +699,7 @@ pri const xmpdataxmp array[11] base.u8 = [
|
||||
]
|
||||
|
||||
// decode_ae reads an Application Extension.
|
||||
pri func decoder.decode_ae?(src base.io_reader) {
|
||||
pri func decoder.decode_ae?(src: base.io_reader) {
|
||||
var c base.u8
|
||||
var block_size base.u8
|
||||
var is_animexts base.bool
|
||||
@@ -812,7 +812,7 @@ pri func decoder.decode_ae?(src base.io_reader) {
|
||||
}
|
||||
|
||||
// decode_gc reads a Graphic Control.
|
||||
pri func decoder.decode_gc?(src base.io_reader) {
|
||||
pri func decoder.decode_gc?(src: base.io_reader) {
|
||||
var c base.u8
|
||||
var flags base.u8
|
||||
var gc_duration_centiseconds base.u16
|
||||
@@ -866,7 +866,7 @@ pri func decoder.decode_gc?(src base.io_reader) {
|
||||
// (part1 and part2) not out of necessity, just for the general programming
|
||||
// principle that smaller functions are easier to understand.
|
||||
|
||||
pri func decoder.decode_id_part0?(src base.io_reader) {
|
||||
pri func decoder.decode_id_part0?(src: base.io_reader) {
|
||||
this.frame_rect_x0 = args.src.read_u16le_as_u32?()
|
||||
this.frame_rect_y0 = args.src.read_u16le_as_u32?()
|
||||
this.frame_rect_x1 = args.src.read_u16le_as_u32?()
|
||||
@@ -887,7 +887,7 @@ pri func decoder.decode_id_part0?(src base.io_reader) {
|
||||
}
|
||||
}
|
||||
|
||||
pri func decoder.decode_id_part1?(dst ptr base.pixel_buffer, src base.io_reader) {
|
||||
pri func decoder.decode_id_part1?(dst: ptr base.pixel_buffer, src: base.io_reader) {
|
||||
var flags base.u8
|
||||
var which_palette base.u8[..= 1]
|
||||
var num_palette_entries base.u32[..= 256]
|
||||
@@ -992,7 +992,7 @@ pri func decoder.decode_id_part1?(dst ptr base.pixel_buffer, src base.io_reader)
|
||||
this.previous_lzw_decode_ended_abruptly = true
|
||||
}
|
||||
|
||||
pri func decoder.decode_id_part2?(dst ptr base.pixel_buffer, src base.io_reader, workbuf slice base.u8) {
|
||||
pri func decoder.decode_id_part2?(dst: ptr base.pixel_buffer, src: base.io_reader, workbuf: slice base.u8) {
|
||||
var block_size base.u64[..= 255]
|
||||
var need_block_size base.bool
|
||||
var n_compressed base.u64
|
||||
@@ -1092,7 +1092,7 @@ pri func decoder.decode_id_part2?(dst ptr base.pixel_buffer, src base.io_reader,
|
||||
}
|
||||
}
|
||||
|
||||
pri func decoder.copy_to_image_buffer!(pb ptr base.pixel_buffer, src slice base.u8) base.status {
|
||||
pri func decoder.copy_to_image_buffer!(pb: ptr base.pixel_buffer, src: slice base.u8) base.status {
|
||||
// TODO: don't assume an interleaved pixel format.
|
||||
var dst slice base.u8
|
||||
var src slice base.u8
|
||||
|
||||
@@ -24,15 +24,15 @@ pub status "#bad header"
|
||||
pub const decoder_workbuf_len_max_incl_worst_case base.u64 = 1
|
||||
|
||||
pub struct decoder?(
|
||||
ignore_checksum base.bool,
|
||||
checksum crc32.ieee_hasher,
|
||||
ignore_checksum : base.bool,
|
||||
checksum : crc32.ieee_hasher,
|
||||
|
||||
flate deflate.decoder,
|
||||
flate : deflate.decoder,
|
||||
|
||||
util base.utility,
|
||||
util : base.utility,
|
||||
)
|
||||
|
||||
pub func decoder.set_ignore_checksum!(ic base.bool) {
|
||||
pub func decoder.set_ignore_checksum!(ic: base.bool) {
|
||||
this.ignore_checksum = args.ic
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ pub func decoder.workbuf_len() base.range_ii_u64 {
|
||||
max_incl: decoder_workbuf_len_max_incl_worst_case)
|
||||
}
|
||||
|
||||
pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) {
|
||||
pub func decoder.decode_io_writer?(dst: base.io_writer, src: base.io_reader, workbuf: slice base.u8) {
|
||||
var c base.u8
|
||||
var flags base.u8
|
||||
var xlen base.u16
|
||||
|
||||
+21
-21
@@ -31,45 +31,45 @@ pub struct decoder?(
|
||||
// set_literal_width. This is assigned to the literal_width field at the
|
||||
// start of decode_io_writer. During that method, calling set_literal_width
|
||||
// will change set_literal_width_arg but not literal_width.
|
||||
set_literal_width_arg base.u32[..= 9],
|
||||
set_literal_width_arg : base.u32[..= 9],
|
||||
|
||||
// read_from state that does not change during a decode call.
|
||||
literal_width base.u32[..= 8],
|
||||
clear_code base.u32[..= 256],
|
||||
end_code base.u32[..= 257],
|
||||
literal_width : base.u32[..= 8],
|
||||
clear_code : base.u32[..= 256],
|
||||
end_code : base.u32[..= 257],
|
||||
|
||||
// read_from state that does change during a decode call.
|
||||
save_code base.u32[..= 4096],
|
||||
prev_code base.u32[..= 4095],
|
||||
width base.u32[..= 12],
|
||||
bits base.u32,
|
||||
n_bits base.u32[..= 31],
|
||||
output_ri base.u32[..= 8191],
|
||||
output_wi base.u32[..= 8191],
|
||||
save_code : base.u32[..= 4096],
|
||||
prev_code : base.u32[..= 4095],
|
||||
width : base.u32[..= 12],
|
||||
bits : base.u32,
|
||||
n_bits : base.u32[..= 31],
|
||||
output_ri : base.u32[..= 8191],
|
||||
output_wi : base.u32[..= 8191],
|
||||
|
||||
// read_from return value. The read_from method effectively returns a
|
||||
// base.u32 to show how decode should continue after calling write_to. That
|
||||
// value needs to be saved across write_to's possible suspension, so we
|
||||
// might as well save it explicitly as a decoder field.
|
||||
read_from_return_value base.u32,
|
||||
read_from_return_value : base.u32,
|
||||
|
||||
// read_from per-code state.
|
||||
prefixes array[4096] base.u16[..= 4095],
|
||||
prefixes : array[4096] base.u16[..= 4095],
|
||||
|
||||
util base.utility,
|
||||
util : base.utility,
|
||||
)(
|
||||
// read_from per-code state.
|
||||
suffixes array[4096] array[8] base.u8,
|
||||
suffixes : array[4096] array[8] base.u8,
|
||||
// lm1s is the "length minus 1"s of the values for the implicit key-value
|
||||
// table in this decoder. See std/lzw/README.md for more detail.
|
||||
lm1s array[4096] base.u16,
|
||||
lm1s : array[4096] base.u16,
|
||||
|
||||
// output[output_ri:output_wi] is the buffered output, connecting read_from
|
||||
// with write_to and flush.
|
||||
output array[8192 + 7] base.u8,
|
||||
output : array[8192 + 7] base.u8,
|
||||
)
|
||||
|
||||
pub func decoder.set_literal_width!(lw base.u32[..= 8]) {
|
||||
pub func decoder.set_literal_width!(lw: base.u32[..= 8]) {
|
||||
this.set_literal_width_arg = args.lw + 1
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ pub func decoder.workbuf_len() base.range_ii_u64 {
|
||||
return this.util.make_range_ii_u64(min_incl: 0, max_incl: 0)
|
||||
}
|
||||
|
||||
pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) {
|
||||
pub func decoder.decode_io_writer?(dst: base.io_writer, src: base.io_reader, workbuf: slice base.u8) {
|
||||
var i base.u32[..= 8191]
|
||||
|
||||
// Initialize read_from state.
|
||||
@@ -123,7 +123,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb
|
||||
}
|
||||
}
|
||||
|
||||
pri func decoder.read_from!(src base.io_reader) {
|
||||
pri func decoder.read_from!(src: base.io_reader) {
|
||||
var clear_code base.u32[..= 256]
|
||||
var end_code base.u32[..= 257]
|
||||
|
||||
@@ -330,7 +330,7 @@ pri func decoder.read_from!(src base.io_reader) {
|
||||
this.output_wi = output_wi
|
||||
}
|
||||
|
||||
pri func decoder.write_to?(dst base.io_writer) {
|
||||
pri func decoder.write_to?(dst: base.io_writer) {
|
||||
var s slice base.u8
|
||||
var n base.u64
|
||||
|
||||
|
||||
+14
-14
@@ -27,29 +27,29 @@ pub status "#incorrect dictionary"
|
||||
pub const decoder_workbuf_len_max_incl_worst_case base.u64 = 1
|
||||
|
||||
pub struct decoder?(
|
||||
bad_call_sequence base.bool,
|
||||
header_complete base.bool,
|
||||
bad_call_sequence : base.bool,
|
||||
header_complete : base.bool,
|
||||
|
||||
got_dictionary base.bool,
|
||||
want_dictionary base.bool,
|
||||
got_dictionary : base.bool,
|
||||
want_dictionary : base.bool,
|
||||
|
||||
ignore_checksum base.bool,
|
||||
checksum adler32.hasher,
|
||||
ignore_checksum : base.bool,
|
||||
checksum : adler32.hasher,
|
||||
|
||||
dict_id_hasher adler32.hasher,
|
||||
dict_id_got base.u32,
|
||||
dict_id_want base.u32,
|
||||
dict_id_hasher : adler32.hasher,
|
||||
dict_id_got : base.u32,
|
||||
dict_id_want : base.u32,
|
||||
|
||||
flate deflate.decoder,
|
||||
flate : deflate.decoder,
|
||||
|
||||
util base.utility,
|
||||
util : base.utility,
|
||||
)
|
||||
|
||||
pub func decoder.dictionary_id() base.u32 {
|
||||
return this.dict_id_want
|
||||
}
|
||||
|
||||
pub func decoder.add_dictionary!(dict slice base.u8) {
|
||||
pub func decoder.add_dictionary!(dict: slice base.u8) {
|
||||
if this.header_complete {
|
||||
this.bad_call_sequence = true
|
||||
} else {
|
||||
@@ -59,7 +59,7 @@ pub func decoder.add_dictionary!(dict slice base.u8) {
|
||||
this.got_dictionary = true
|
||||
}
|
||||
|
||||
pub func decoder.set_ignore_checksum!(ic base.bool) {
|
||||
pub func decoder.set_ignore_checksum!(ic: base.bool) {
|
||||
this.ignore_checksum = args.ic
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ pub func decoder.workbuf_len() base.range_ii_u64 {
|
||||
max_incl: decoder_workbuf_len_max_incl_worst_case)
|
||||
}
|
||||
|
||||
pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) {
|
||||
pub func decoder.decode_io_writer?(dst: base.io_writer, src: base.io_reader, workbuf: slice base.u8) {
|
||||
var x base.u16
|
||||
var checksum_got base.u32
|
||||
var status base.status
|
||||
|
||||
Reference in new issue
Block a user