mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Make endwhile mandatory for nameless loops
This commit is contained in:
1 parent
3c38f671fa
commit
58351d44da
15 files changed
+138
-136
No files matched your search
+1
-1
@@ -539,7 +539,7 @@ func NewIterate(label t.ID, assigns []*Node, length t.ID, unroll t.ID, asserts [
|
||||
}
|
||||
}
|
||||
|
||||
// While is "while.ID1 MHS, List1 { List2 }":
|
||||
// While is "while.ID1 MHS, List1 { List2 } endwhile.ID1":
|
||||
// - FlagsHasBreak is the while has an explicit break
|
||||
// - FlagsHasContinue is the while has an explicit continue
|
||||
// - ID1: <0|label>
|
||||
|
||||
+16
-10
@@ -649,14 +649,16 @@ func (p *parser) parseEndwhile(label t.ID) bool {
|
||||
return false
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
if p.peek1() != t.IDDot {
|
||||
return false
|
||||
if label != 0 {
|
||||
if p.peek1() != t.IDDot {
|
||||
return false
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
if p.peek1() != label {
|
||||
return false
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
if p.peek1() != label {
|
||||
return false
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -737,9 +739,13 @@ func (p *parser) parseStatement1() (*a.Node, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if (label != 0) && !p.parseEndwhile(label) {
|
||||
return nil, fmt.Errorf(`parse: expected endwhile.%s at %s:%d`,
|
||||
label.Str(p.tm), p.filename, p.line())
|
||||
if !p.parseEndwhile(label) {
|
||||
dotLabel := ""
|
||||
if label != 0 {
|
||||
dotLabel = "." + label.Str(p.tm)
|
||||
}
|
||||
return nil, fmt.Errorf(`parse: expected endwhile%s at %s:%d`,
|
||||
dotLabel, p.filename, p.line())
|
||||
}
|
||||
return a.NewWhile(label, condition, asserts, body).AsNode(), nil
|
||||
}
|
||||
|
||||
@@ -16679,7 +16679,7 @@ wuffs_gif__config_decoder__decode_ae(wuffs_gif__config_decoder* self,
|
||||
goto suspend;
|
||||
}
|
||||
iop_a_src += self->private_data.s_decode_ae[0].scratch;
|
||||
goto label__0__break;
|
||||
goto label__goto_done__break;
|
||||
}
|
||||
v_is_animexts = true;
|
||||
v_is_netscape = true;
|
||||
@@ -16738,7 +16738,7 @@ wuffs_gif__config_decoder__decode_ae(wuffs_gif__config_decoder* self,
|
||||
goto suspend;
|
||||
}
|
||||
iop_a_src += self->private_data.s_decode_ae[0].scratch;
|
||||
goto label__0__break;
|
||||
goto label__goto_done__break;
|
||||
}
|
||||
{
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
|
||||
@@ -16763,7 +16763,7 @@ wuffs_gif__config_decoder__decode_ae(wuffs_gif__config_decoder* self,
|
||||
goto suspend;
|
||||
}
|
||||
iop_a_src += self->private_data.s_decode_ae[0].scratch;
|
||||
goto label__0__break;
|
||||
goto label__goto_done__break;
|
||||
}
|
||||
{
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
|
||||
@@ -16839,9 +16839,9 @@ wuffs_gif__config_decoder__decode_ae(wuffs_gif__config_decoder* self,
|
||||
status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
|
||||
goto ok;
|
||||
}
|
||||
goto label__0__break;
|
||||
goto label__goto_done__break;
|
||||
}
|
||||
label__0__break:;
|
||||
label__goto_done__break:;
|
||||
if (a_src) {
|
||||
a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
|
||||
}
|
||||
@@ -18575,7 +18575,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self,
|
||||
goto suspend;
|
||||
}
|
||||
iop_a_src += self->private_data.s_decode_ae[0].scratch;
|
||||
goto label__0__break;
|
||||
goto label__goto_done__break;
|
||||
}
|
||||
v_is_animexts = true;
|
||||
v_is_netscape = true;
|
||||
@@ -18634,7 +18634,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self,
|
||||
goto suspend;
|
||||
}
|
||||
iop_a_src += self->private_data.s_decode_ae[0].scratch;
|
||||
goto label__0__break;
|
||||
goto label__goto_done__break;
|
||||
}
|
||||
{
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
|
||||
@@ -18659,7 +18659,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self,
|
||||
goto suspend;
|
||||
}
|
||||
iop_a_src += self->private_data.s_decode_ae[0].scratch;
|
||||
goto label__0__break;
|
||||
goto label__goto_done__break;
|
||||
}
|
||||
{
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
|
||||
@@ -18735,9 +18735,9 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self,
|
||||
status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
|
||||
goto ok;
|
||||
}
|
||||
goto label__0__break;
|
||||
goto label__goto_done__break;
|
||||
}
|
||||
label__0__break:;
|
||||
label__goto_done__break:;
|
||||
if (a_src) {
|
||||
a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ pub func hasher.update_u32!(x: slice base.u8) base.u32 {
|
||||
s2 %= 65521
|
||||
|
||||
args.x = remaining
|
||||
}
|
||||
} endwhile
|
||||
|
||||
this.state = ((s2 & 0xFFFF) << 16) | (s1 & 0xFFFF)
|
||||
return this.state
|
||||
|
||||
@@ -277,7 +277,7 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader,
|
||||
} else {
|
||||
return status
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
this.call_sequence = 3
|
||||
@@ -314,7 +314,7 @@ pri func decoder.swizzle!(dst: ptr base.pixel_buffer, src: slice base.u8) base.s
|
||||
}
|
||||
this.pending_pad -= 1
|
||||
args.src = args.src[1 ..]
|
||||
}
|
||||
} endwhile
|
||||
|
||||
// Handle the case where the I/O suspension occurred in the middle of a
|
||||
// source pixel.
|
||||
@@ -327,7 +327,7 @@ pri func decoder.swizzle!(dst: ptr base.pixel_buffer, src: slice base.u8) base.s
|
||||
this.stash[this.num_stashed] = args.src[0]
|
||||
this.num_stashed += 1
|
||||
args.src = args.src[1 ..]
|
||||
}
|
||||
} endwhile
|
||||
|
||||
// Write the single pixel.
|
||||
dst = tab.row(y: this.dst_y)
|
||||
@@ -393,10 +393,10 @@ pri func decoder.swizzle!(dst: ptr base.pixel_buffer, src: slice base.u8) base.s
|
||||
this.stash[this.num_stashed] = args.src[0]
|
||||
this.num_stashed += 1
|
||||
args.src = args.src[1 ..]
|
||||
}
|
||||
} endwhile
|
||||
return base."$short read"
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
|
||||
return ok
|
||||
}
|
||||
|
||||
@@ -211,7 +211,7 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf
|
||||
// can change the veracity of any args.dst assertions?
|
||||
this.add_history!(hist: args.dst.since(mark: mark))
|
||||
yield? status
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
pri func decoder.decode_blocks?(dst: base.io_writer, src: base.io_reader) {
|
||||
@@ -227,7 +227,7 @@ pri func decoder.decode_blocks?(dst: base.io_writer, src: base.io_reader) {
|
||||
b0 = args.src.read_u8_as_u32?()
|
||||
this.bits |= b0 << this.n_bits
|
||||
this.n_bits += 8
|
||||
}
|
||||
} endwhile
|
||||
final = this.bits & 0x01
|
||||
type = (this.bits >> 1) & 0x03
|
||||
this.bits >>= 3
|
||||
@@ -266,7 +266,7 @@ pri func decoder.decode_blocks?(dst: base.io_writer, src: base.io_reader) {
|
||||
if this.end_of_block {
|
||||
continue.outer
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
} endwhile.outer
|
||||
}
|
||||
|
||||
@@ -301,7 +301,7 @@ pri func decoder.decode_uncompressed?(dst: base.io_writer, src: base.io_reader)
|
||||
} else {
|
||||
yield? base."$short read"
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
// init_fixed_huffman initializes this.huffs as per the RFC section 3.2.6.
|
||||
@@ -312,23 +312,23 @@ pri func decoder.init_fixed_huffman!() base.status {
|
||||
while i < 144 {
|
||||
this.code_lengths[i] = 8
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
while i < 256 {
|
||||
this.code_lengths[i] = 9
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
while i < 280 {
|
||||
this.code_lengths[i] = 7
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
while i < 288 {
|
||||
this.code_lengths[i] = 8
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
while i < 320 {
|
||||
this.code_lengths[i] = 5
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
|
||||
status = this.init_huff!(which: 0, n_codes0: 0, n_codes1: 288, base_symbol: 257)
|
||||
if status.is_error() {
|
||||
@@ -369,7 +369,7 @@ pri func decoder.init_dynamic_huffman?(src: base.io_reader) {
|
||||
b0 = args.src.read_u8_as_u32?()
|
||||
bits |= b0 << n_bits
|
||||
n_bits += 8
|
||||
}
|
||||
} endwhile
|
||||
n_lit = bits.low_bits(n: 5) + 257
|
||||
if n_lit > 286 {
|
||||
return "#bad literal/length code count"
|
||||
@@ -394,17 +394,17 @@ pri func decoder.init_dynamic_huffman?(src: base.io_reader) {
|
||||
b1 = args.src.read_u8_as_u32?()
|
||||
bits |= b1 << n_bits
|
||||
n_bits += 8
|
||||
}
|
||||
} endwhile
|
||||
assert i < 19 via "a < b: a < c; c <= b"(c: n_clen)
|
||||
this.code_lengths[code_order[i]] = (bits & 0x07) as base.u8
|
||||
bits >>= 3
|
||||
n_bits -= 3
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
while i < 19 {
|
||||
this.code_lengths[code_order[i]] = 0
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
status = this.init_huff!(which: 0, n_codes0: 0, n_codes1: 19, base_symbol: 0xFFF)
|
||||
if status.is_error() {
|
||||
return status
|
||||
@@ -431,7 +431,7 @@ pri func decoder.init_dynamic_huffman?(src: base.io_reader) {
|
||||
b2 = args.src.read_u8_as_u32?()
|
||||
bits |= b2 << n_bits
|
||||
n_bits += 8
|
||||
}
|
||||
} endwhile
|
||||
// For H-CL, there should be no redirections and all symbols should be
|
||||
// literals.
|
||||
if (table_entry >> 24) <> 0x80 {
|
||||
@@ -480,7 +480,7 @@ pri func decoder.init_dynamic_huffman?(src: base.io_reader) {
|
||||
b3 = args.src.read_u8_as_u32?()
|
||||
bits |= b3 << n_bits
|
||||
n_bits += 8
|
||||
}
|
||||
} endwhile
|
||||
rep_count += bits.low_bits(n: n_extra_bits)
|
||||
bits >>= n_extra_bits
|
||||
n_bits -= n_extra_bits
|
||||
@@ -494,8 +494,8 @@ pri func decoder.init_dynamic_huffman?(src: base.io_reader) {
|
||||
this.code_lengths[i] = rep_symbol
|
||||
i += 1
|
||||
rep_count -= 1
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
} endwhile
|
||||
|
||||
if i <> (n_lit + n_dist) {
|
||||
return "#bad Huffman code length count"
|
||||
@@ -588,7 +588,7 @@ pri func decoder.init_huff!(which: base.u32[..= 1], n_codes0: base.u32[..= 288],
|
||||
}
|
||||
counts[this.code_lengths[i] & 15] += 1
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
if ((counts[0] as base.u32) + args.n_codes0) == args.n_codes1 {
|
||||
return "#no Huffman codes"
|
||||
}
|
||||
@@ -607,7 +607,7 @@ pri func decoder.init_huff!(which: base.u32[..= 1], n_codes0: base.u32[..= 288],
|
||||
}
|
||||
remaining -= counts[i] as base.u32
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
if remaining <> 0 {
|
||||
// As a special case, allow a degenerate H-D Huffman table, with only
|
||||
// one 1-bit code, for the smallest possible distance.
|
||||
@@ -648,7 +648,7 @@ pri func decoder.init_huff!(which: base.u32[..= 1], n_codes0: base.u32[..= 288],
|
||||
// bounds checking can handle it.
|
||||
n_symbols = n_symbols + count
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
if n_symbols > 288 {
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
@@ -688,7 +688,7 @@ pri func decoder.init_huff!(which: base.u32[..= 1], n_codes0: base.u32[..= 288],
|
||||
offsets[this.code_lengths[i] & 15] += 1
|
||||
}
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
|
||||
// Calculate min_cl and max_cl.
|
||||
//
|
||||
@@ -706,7 +706,7 @@ pri func decoder.init_huff!(which: base.u32[..= 1], n_codes0: base.u32[..= 288],
|
||||
return "#bad Huffman minimum code length"
|
||||
}
|
||||
min_cl += 1
|
||||
}
|
||||
} endwhile
|
||||
max_cl = 15
|
||||
while true,
|
||||
inv n_symbols <= 288,
|
||||
@@ -718,7 +718,7 @@ pri func decoder.init_huff!(which: base.u32[..= 1], n_codes0: base.u32[..= 288],
|
||||
return "#no Huffman codes"
|
||||
}
|
||||
max_cl -= 1
|
||||
}
|
||||
} endwhile
|
||||
if max_cl <= 9 {
|
||||
this.n_huffs_bits[args.which] = max_cl
|
||||
} else {
|
||||
@@ -806,7 +806,7 @@ pri func decoder.init_huff!(which: base.u32[..= 1], n_codes0: base.u32[..= 288],
|
||||
}
|
||||
remaining <<= 1
|
||||
j += 1
|
||||
}
|
||||
} endwhile
|
||||
if (j <= 9) or (15 < j) {
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
@@ -867,7 +867,7 @@ pri func decoder.init_huff!(which: base.u32[..= 1], n_codes0: base.u32[..= 288],
|
||||
}
|
||||
assert (top + ((high_bits | reversed_key) & 511)) < 1024 via "a < b: a < c; c <= b"(c: huffs_table_size)
|
||||
this.huffs[args.which][top + ((high_bits | reversed_key) & 511)] = value
|
||||
}
|
||||
} endwhile
|
||||
|
||||
i += 1
|
||||
if i >= n_symbols {
|
||||
@@ -878,6 +878,6 @@ pri func decoder.init_huff!(which: base.u32[..= 1], n_codes0: base.u32[..= 288],
|
||||
if code >= (1 << 15) {
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
return ok
|
||||
}
|
||||
@@ -341,7 +341,7 @@ pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader)
|
||||
// Copy from args.dst.
|
||||
args.dst.copy_n32_from_history_fast!(n: length, distance: (dist_minus_1 + 1))
|
||||
break
|
||||
}
|
||||
} endwhile
|
||||
} endwhile.loop
|
||||
|
||||
// Ensure n_bits < 8 by rewindng args.src, if we loaded too many of its
|
||||
@@ -363,7 +363,7 @@ pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader)
|
||||
} else {
|
||||
return "#internal error: inconsistent I/O"
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
|
||||
this.bits = bits & (((1 as base.u32) << n_bits) - 1)
|
||||
this.n_bits = n_bits
|
||||
|
||||
@@ -62,7 +62,7 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
|
||||
b0 = args.src.read_u8_as_u32?()
|
||||
bits |= b0 << n_bits
|
||||
n_bits += 8
|
||||
}
|
||||
} endwhile
|
||||
|
||||
if (table_entry >> 31) <> 0 {
|
||||
// Literal.
|
||||
@@ -90,7 +90,7 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
|
||||
b1 = args.src.read_u8_as_u32?()
|
||||
bits |= b1 << n_bits
|
||||
n_bits += 8
|
||||
}
|
||||
} endwhile
|
||||
|
||||
if (table_entry >> 31) <> 0 {
|
||||
// Literal.
|
||||
@@ -130,7 +130,7 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
|
||||
b2 = args.src.read_u8_as_u32?()
|
||||
bits |= b2 << n_bits
|
||||
n_bits += 8
|
||||
}
|
||||
} endwhile
|
||||
// The "+ 253" is the same as "- 3", after the "& 0xFF", but the
|
||||
// plus form won't require an underflow check.
|
||||
length = ((length + 253 + bits.low_bits(n: table_entry_n_bits)) & 0xFF) + 3
|
||||
@@ -151,7 +151,7 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
|
||||
b3 = args.src.read_u8_as_u32?()
|
||||
bits |= b3 << n_bits
|
||||
n_bits += 8
|
||||
}
|
||||
} endwhile
|
||||
// Check for a redirect.
|
||||
if (table_entry >> 28) == 1 {
|
||||
redir_top = (table_entry >> 8) & 0xFFFF
|
||||
@@ -168,7 +168,7 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
|
||||
b4 = args.src.read_u8_as_u32?()
|
||||
bits |= b4 << n_bits
|
||||
n_bits += 8
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
// For H-D, all symbols should be base_number + extra_bits.
|
||||
@@ -195,7 +195,7 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
|
||||
b5 = args.src.read_u8_as_u32?()
|
||||
bits |= b5 << n_bits
|
||||
n_bits += 8
|
||||
}
|
||||
} endwhile
|
||||
dist_minus_1 = (dist_minus_1 + bits.low_bits(n: table_entry_n_bits)) & 0x7FFF
|
||||
bits >>= table_entry_n_bits
|
||||
n_bits -= table_entry_n_bits
|
||||
@@ -241,7 +241,7 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
|
||||
}
|
||||
}
|
||||
yield? base."$short write"
|
||||
}
|
||||
} endwhile
|
||||
// Copy from the start of this.history, if we wrapped around.
|
||||
if hlen > 0 {
|
||||
while true {
|
||||
@@ -254,7 +254,7 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
|
||||
hlen -= n_copied
|
||||
hdist ~mod+= n_copied
|
||||
yield? base."$short write"
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
if length == 0 {
|
||||
@@ -271,7 +271,7 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
|
||||
}
|
||||
length -= n_copied
|
||||
yield? base."$short write"
|
||||
}
|
||||
} endwhile
|
||||
} endwhile.loop
|
||||
|
||||
// TODO: "assert n_bits < 8"? What about (bits >> n_bits)?
|
||||
|
||||
+16
-18
@@ -200,7 +200,7 @@ pub func config_decoder.ack_metadata_chunk?(src: base.io_reader) {
|
||||
post args.src.available() > 0,
|
||||
{
|
||||
yield? base."$short read"
|
||||
}
|
||||
} endwhile
|
||||
|
||||
this.metadata_chunk_length_value = args.src.peek_u8_as_u64()
|
||||
if this.metadata_chunk_length_value > 0 {
|
||||
@@ -308,7 +308,7 @@ pub func config_decoder.decode_frame_config?(dst: nptr base.frame_config, src: b
|
||||
post args.src.available() > 0,
|
||||
{
|
||||
yield? base."$short read"
|
||||
}
|
||||
} endwhile
|
||||
flags = args.src.peek_u8()
|
||||
if (flags & 0x80) <> 0 {
|
||||
background_color = this.black_color_u32_argb_premul
|
||||
@@ -413,7 +413,7 @@ pri func config_decoder.decode_up_to_id_part1?(src: base.io_reader) {
|
||||
} else {
|
||||
return "#bad block"
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
// decode_header reads either "GIF87a" or "GIF89a".
|
||||
@@ -426,7 +426,7 @@ pri func config_decoder.decode_header?(src: base.io_reader) {
|
||||
while i < 6 {
|
||||
c[i] = args.src.read_u8?()
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
if (c[0] <> 'G') or (c[1] <> 'I') or (c[2] <> 'F') or (c[3] <> '8') or
|
||||
((c[4] <> '7') and (c[4] <> '9')) or (c[5] <> 'a') {
|
||||
return "#bad header"
|
||||
@@ -467,7 +467,7 @@ pri func config_decoder.decode_lsd?(src: base.io_reader) {
|
||||
this.palettes[0][(4 * i) + 2] = ((argb >> 16) & 0xFF) as base.u8
|
||||
this.palettes[0][(4 * i) + 3] = ((argb >> 24) & 0xFF) as base.u8
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
|
||||
if this.quirk_enabled_honor_background_color {
|
||||
if (background_color_index <> 0) and
|
||||
@@ -496,7 +496,7 @@ pri func config_decoder.decode_lsd?(src: base.io_reader) {
|
||||
this.palettes[0][(4 * i) + 2] = 0x00
|
||||
this.palettes[0][(4 * i) + 3] = 0xFF
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
// decode_extension reads an extension. The Extension Introducer byte has
|
||||
@@ -532,7 +532,7 @@ pri func config_decoder.skip_blocks?(src: base.io_reader) {
|
||||
return ok
|
||||
}
|
||||
args.src.skip32?(n: block_size as base.u32)
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
// decode_ae reads an Application Extension.
|
||||
@@ -544,9 +544,7 @@ pri func config_decoder.decode_ae?(src: base.io_reader) {
|
||||
var is_iccp : base.bool
|
||||
var is_xmp : base.bool
|
||||
|
||||
// This "while true" always executes exactly once, as it ends with a
|
||||
// "break", but using "break"s throughout simplifies the control flow.
|
||||
while true {
|
||||
while.goto_done true {
|
||||
block_size = args.src.read_u8?()
|
||||
if block_size == 0 {
|
||||
return ok
|
||||
@@ -560,7 +558,7 @@ pri func config_decoder.decode_ae?(src: base.io_reader) {
|
||||
// Other extensions include XMP metadata.
|
||||
if block_size <> 11 {
|
||||
args.src.skip32?(n: block_size as base.u32)
|
||||
break
|
||||
break.goto_done
|
||||
}
|
||||
is_animexts = true
|
||||
is_netscape = true
|
||||
@@ -574,7 +572,7 @@ pri func config_decoder.decode_ae?(src: base.io_reader) {
|
||||
is_iccp = is_iccp and (c == iccrgbg1012[block_size])
|
||||
is_xmp = is_xmp and (c == xmpdataxmp[block_size])
|
||||
block_size += 1
|
||||
}
|
||||
} endwhile
|
||||
|
||||
if is_animexts or is_netscape {
|
||||
// Those 11 bytes should be followed by 0x03, 0x01 and then the loop
|
||||
@@ -582,12 +580,12 @@ pri func config_decoder.decode_ae?(src: base.io_reader) {
|
||||
block_size = args.src.read_u8?()
|
||||
if block_size <> 3 {
|
||||
args.src.skip32?(n: block_size as base.u32)
|
||||
break
|
||||
break.goto_done
|
||||
}
|
||||
c = args.src.read_u8?()
|
||||
if c <> 0x01 {
|
||||
args.src.skip32?(n: 2)
|
||||
break
|
||||
break.goto_done
|
||||
}
|
||||
this.num_loops = args.src.read_u16le_as_u32?()
|
||||
this.seen_num_loops = true
|
||||
@@ -614,7 +612,7 @@ pri func config_decoder.decode_ae?(src: base.io_reader) {
|
||||
post args.src.available() > 0,
|
||||
{
|
||||
yield? base."$short read"
|
||||
}
|
||||
} endwhile
|
||||
this.metadata_chunk_length_value = args.src.peek_u8_as_u64()
|
||||
args.src.skip32_fast!(actual: 1, worst_case: 1)
|
||||
this.metadata_fourcc_value = 'ICCP'be
|
||||
@@ -627,7 +625,7 @@ pri func config_decoder.decode_ae?(src: base.io_reader) {
|
||||
post args.src.available() > 0,
|
||||
{
|
||||
yield? base."$short read"
|
||||
}
|
||||
} endwhile
|
||||
this.metadata_chunk_length_value = args.src.peek_u8_as_u64()
|
||||
if this.metadata_chunk_length_value > 0 {
|
||||
// The +1 is because XMP metadata's encoding includes each
|
||||
@@ -643,8 +641,8 @@ pri func config_decoder.decode_ae?(src: base.io_reader) {
|
||||
return base."@metadata reported"
|
||||
}
|
||||
|
||||
break
|
||||
}
|
||||
break.goto_done
|
||||
} endwhile.goto_done
|
||||
this.skip_blocks?(src: args.src)
|
||||
}
|
||||
|
||||
|
||||
+24
-26
@@ -239,7 +239,7 @@ pub func decoder.ack_metadata_chunk?(src: base.io_reader) {
|
||||
post args.src.available() > 0,
|
||||
{
|
||||
yield? base."$short read"
|
||||
}
|
||||
} endwhile
|
||||
|
||||
this.metadata_chunk_length_value = args.src.peek_u8_as_u64()
|
||||
if this.metadata_chunk_length_value > 0 {
|
||||
@@ -367,7 +367,7 @@ pub func decoder.decode_frame_config?(dst: nptr base.frame_config, src: base.io_
|
||||
post args.src.available() > 0,
|
||||
{
|
||||
yield? base."$short read"
|
||||
}
|
||||
} endwhile
|
||||
flags = args.src.peek_u8()
|
||||
if (flags & 0x80) <> 0 {
|
||||
background_color = this.black_color_u32_argb_premul
|
||||
@@ -488,7 +488,7 @@ pri func decoder.decode_up_to_id_part1?(src: base.io_reader) {
|
||||
} else {
|
||||
return "#bad block"
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
// decode_header reads either "GIF87a" or "GIF89a".
|
||||
@@ -501,7 +501,7 @@ pri func decoder.decode_header?(src: base.io_reader) {
|
||||
while i < 6 {
|
||||
c[i] = args.src.read_u8?()
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
if (c[0] <> 'G') or (c[1] <> 'I') or (c[2] <> 'F') or (c[3] <> '8') or
|
||||
((c[4] <> '7') and (c[4] <> '9')) or (c[5] <> 'a') {
|
||||
return "#bad header"
|
||||
@@ -542,7 +542,7 @@ pri func decoder.decode_lsd?(src: base.io_reader) {
|
||||
this.palettes[0][(4 * i) + 2] = ((argb >> 16) & 0xFF) as base.u8
|
||||
this.palettes[0][(4 * i) + 3] = ((argb >> 24) & 0xFF) as base.u8
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
|
||||
if this.quirk_enabled_honor_background_color {
|
||||
if (background_color_index <> 0) and
|
||||
@@ -571,7 +571,7 @@ pri func decoder.decode_lsd?(src: base.io_reader) {
|
||||
this.palettes[0][(4 * i) + 2] = 0x00
|
||||
this.palettes[0][(4 * i) + 3] = 0xFF
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
// decode_extension reads an extension. The Extension Introducer byte has
|
||||
@@ -607,7 +607,7 @@ pri func decoder.skip_blocks?(src: base.io_reader) {
|
||||
return ok
|
||||
}
|
||||
args.src.skip32?(n: block_size as base.u32)
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
// decode_ae reads an Application Extension.
|
||||
@@ -619,9 +619,7 @@ pri func decoder.decode_ae?(src: base.io_reader) {
|
||||
var is_iccp : base.bool
|
||||
var is_xmp : base.bool
|
||||
|
||||
// This "while true" always executes exactly once, as it ends with a
|
||||
// "break", but using "break"s throughout simplifies the control flow.
|
||||
while true {
|
||||
while.goto_done true {
|
||||
block_size = args.src.read_u8?()
|
||||
if block_size == 0 {
|
||||
return ok
|
||||
@@ -635,7 +633,7 @@ pri func decoder.decode_ae?(src: base.io_reader) {
|
||||
// Other extensions include XMP metadata.
|
||||
if block_size <> 11 {
|
||||
args.src.skip32?(n: block_size as base.u32)
|
||||
break
|
||||
break.goto_done
|
||||
}
|
||||
is_animexts = true
|
||||
is_netscape = true
|
||||
@@ -649,7 +647,7 @@ pri func decoder.decode_ae?(src: base.io_reader) {
|
||||
is_iccp = is_iccp and (c == iccrgbg1012[block_size])
|
||||
is_xmp = is_xmp and (c == xmpdataxmp[block_size])
|
||||
block_size += 1
|
||||
}
|
||||
} endwhile
|
||||
|
||||
if is_animexts or is_netscape {
|
||||
// Those 11 bytes should be followed by 0x03, 0x01 and then the loop
|
||||
@@ -657,12 +655,12 @@ pri func decoder.decode_ae?(src: base.io_reader) {
|
||||
block_size = args.src.read_u8?()
|
||||
if block_size <> 3 {
|
||||
args.src.skip32?(n: block_size as base.u32)
|
||||
break
|
||||
break.goto_done
|
||||
}
|
||||
c = args.src.read_u8?()
|
||||
if c <> 0x01 {
|
||||
args.src.skip32?(n: 2)
|
||||
break
|
||||
break.goto_done
|
||||
}
|
||||
this.num_loops = args.src.read_u16le_as_u32?()
|
||||
this.seen_num_loops = true
|
||||
@@ -689,7 +687,7 @@ pri func decoder.decode_ae?(src: base.io_reader) {
|
||||
post args.src.available() > 0,
|
||||
{
|
||||
yield? base."$short read"
|
||||
}
|
||||
} endwhile
|
||||
this.metadata_chunk_length_value = args.src.peek_u8_as_u64()
|
||||
args.src.skip32_fast!(actual: 1, worst_case: 1)
|
||||
this.metadata_fourcc_value = 'ICCP'be
|
||||
@@ -702,7 +700,7 @@ pri func decoder.decode_ae?(src: base.io_reader) {
|
||||
post args.src.available() > 0,
|
||||
{
|
||||
yield? base."$short read"
|
||||
}
|
||||
} endwhile
|
||||
this.metadata_chunk_length_value = args.src.peek_u8_as_u64()
|
||||
if this.metadata_chunk_length_value > 0 {
|
||||
// The +1 is because XMP metadata's encoding includes each
|
||||
@@ -718,8 +716,8 @@ pri func decoder.decode_ae?(src: base.io_reader) {
|
||||
return base."@metadata reported"
|
||||
}
|
||||
|
||||
break
|
||||
}
|
||||
break.goto_done
|
||||
} endwhile.goto_done
|
||||
this.skip_blocks?(src: args.src)
|
||||
}
|
||||
|
||||
@@ -836,7 +834,7 @@ pri func decoder.decode_id_part1?(dst: ptr base.pixel_buffer, src: base.io_reade
|
||||
this.palettes[1][(4 * i) + 2] = ((argb >> 16) & 0xFF) as base.u8
|
||||
this.palettes[1][(4 * i) + 3] = ((argb >> 24) & 0xFF) as base.u8
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
// Set the remaining palette entries to opaque black.
|
||||
while i < 256 {
|
||||
this.palettes[1][(4 * i) + 0] = 0x00
|
||||
@@ -844,7 +842,7 @@ pri func decoder.decode_id_part1?(dst: ptr base.pixel_buffer, src: base.io_reade
|
||||
this.palettes[1][(4 * i) + 2] = 0x00
|
||||
this.palettes[1][(4 * i) + 3] = 0xFF
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
} else if this.quirk_enabled_reject_empty_palette and (not this.has_global_palette) {
|
||||
return "#bad palette"
|
||||
} else if this.gc_has_transparent_index {
|
||||
@@ -931,7 +929,7 @@ pri func decoder.decode_id_part2?(dst: ptr base.pixel_buffer, src: base.io_reade
|
||||
}
|
||||
while args.src.available() == 0 {
|
||||
yield? base."$short read"
|
||||
}
|
||||
} endwhile
|
||||
|
||||
if this.compressed_ri == this.compressed_wi {
|
||||
this.compressed_ri = 0
|
||||
@@ -955,7 +953,7 @@ pri func decoder.decode_id_part2?(dst: ptr base.pixel_buffer, src: base.io_reade
|
||||
}
|
||||
block_size = args.src.peek_u8_as_u64()
|
||||
args.src.skip32_fast!(actual: 1, worst_case: 1)
|
||||
}
|
||||
} endwhile
|
||||
|
||||
while.inner true {
|
||||
if (this.compressed_ri > this.compressed_wi) or (this.compressed_wi > 4096) {
|
||||
@@ -1098,7 +1096,7 @@ pri func decoder.copy_to_image_buffer!(pb: ptr base.pixel_buffer, src: slice bas
|
||||
replicate_dst = tab.row(y: replicate_y0)
|
||||
replicate_dst.copy_from_slice!(s: replicate_src)
|
||||
replicate_y0 += 1
|
||||
}
|
||||
} endwhile
|
||||
this.dirty_max_excl_y = this.dirty_max_excl_y.max(a: replicate_y1)
|
||||
}
|
||||
|
||||
@@ -1106,7 +1104,7 @@ pri func decoder.copy_to_image_buffer!(pb: ptr base.pixel_buffer, src: slice bas
|
||||
while (this.interlace > 0) and (this.dst_y >= this.frame_rect_y1) {
|
||||
this.interlace -= 1
|
||||
this.dst_y = this.frame_rect_y0 ~sat+ interlace_start[this.interlace]
|
||||
}
|
||||
} endwhile
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -1132,7 +1130,7 @@ pri func decoder.copy_to_image_buffer!(pb: ptr base.pixel_buffer, src: slice bas
|
||||
while (this.interlace > 0) and (this.dst_y >= this.frame_rect_y1) {
|
||||
this.interlace -= 1
|
||||
this.dst_y = this.frame_rect_y0 ~sat+ interlace_start[this.interlace]
|
||||
}
|
||||
} endwhile
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -1140,7 +1138,7 @@ pri func decoder.copy_to_image_buffer!(pb: ptr base.pixel_buffer, src: slice bas
|
||||
return "#internal error: inconsistent ri/wi"
|
||||
}
|
||||
break
|
||||
}
|
||||
} endwhile
|
||||
return ok
|
||||
}
|
||||
//#DONE PREPROC900
|
||||
@@ -87,7 +87,7 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf
|
||||
if c == 0 {
|
||||
break
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
// Handle FCOMMENT.
|
||||
@@ -97,7 +97,7 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf
|
||||
if c == 0 {
|
||||
break
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
// Handle FHCRC.
|
||||
@@ -122,7 +122,7 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf
|
||||
break
|
||||
}
|
||||
yield? status
|
||||
}
|
||||
} endwhile
|
||||
checksum_want = args.src.read_u32le?()
|
||||
decoded_length_want = args.src.read_u32le?()
|
||||
if (not this.ignore_checksum) and
|
||||
|
||||
+13
-13
@@ -141,7 +141,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
|
||||
while this.end_of_data {
|
||||
return base."@end of data"
|
||||
}
|
||||
} endwhile
|
||||
|
||||
if this.quirk_enabled_allow_leading_ascii_record_separator or
|
||||
this.quirk_enabled_allow_leading_unicode_byte_order_mark {
|
||||
@@ -286,7 +286,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
continue.string_loop_outer
|
||||
}
|
||||
string_length += 4
|
||||
}
|
||||
} endwhile
|
||||
|
||||
c = args.src.peek_u8()
|
||||
char = lut_chars[c]
|
||||
@@ -592,7 +592,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
}
|
||||
args.src.skip32_fast!(actual: 4, worst_case: 4)
|
||||
backslash_x_length += 4
|
||||
}
|
||||
} endwhile
|
||||
|
||||
if backslash_x_length == 0 {
|
||||
return "#bad backslash-escape"
|
||||
@@ -809,7 +809,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
link: 0x2,
|
||||
length: 1)
|
||||
break
|
||||
}
|
||||
} endwhile
|
||||
|
||||
// As above, expect must have contained EXPECT_STRING. If it
|
||||
// didn't also contain EXPECT_NUMBER then we were parsing an
|
||||
@@ -885,7 +885,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
} else {
|
||||
return "#internal error: inconsistent I/O"
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
|
||||
if number_status == 1 {
|
||||
if this.quirk_enabled_allow_inf_nan_numbers {
|
||||
@@ -901,9 +901,9 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
post args.dst.available() > 0,
|
||||
{
|
||||
yield? base."$short write"
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
break.goto_parsed_a_leaf_value
|
||||
// -------- END parse numbers.
|
||||
|
||||
@@ -1280,7 +1280,7 @@ pri func decoder.decode_digits!(src: base.io_reader, n: base.u32[..= 99]) base.u
|
||||
}
|
||||
n += 1
|
||||
args.src.skip32_fast!(actual: 1, worst_case: 1)
|
||||
}
|
||||
} endwhile
|
||||
if n == args.n {
|
||||
n |= 0x100
|
||||
}
|
||||
@@ -1330,7 +1330,7 @@ pri func decoder.decode_leading?(dst: base.token_writer, src: base.io_reader) {
|
||||
}
|
||||
}
|
||||
break
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) {
|
||||
@@ -1351,7 +1351,7 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) {
|
||||
return "#bad input"
|
||||
}
|
||||
yield? base."$short read"
|
||||
}
|
||||
} endwhile
|
||||
c2 = args.src.peek_u16le()
|
||||
|
||||
if (c2 == '/*'le) and this.quirk_enabled_allow_comment_block {
|
||||
@@ -1408,7 +1408,7 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) {
|
||||
continue.comment_block
|
||||
}
|
||||
length += 1
|
||||
}
|
||||
} endwhile
|
||||
} endwhile.comment_block
|
||||
|
||||
} else if (c2 == '//'le) and this.quirk_enabled_allow_comment_line {
|
||||
@@ -1465,7 +1465,7 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) {
|
||||
continue.comment_line
|
||||
}
|
||||
length += 1
|
||||
}
|
||||
} endwhile
|
||||
} endwhile.comment_line
|
||||
}
|
||||
|
||||
@@ -1574,7 +1574,7 @@ pri func decoder.decode_inf_nan?(dst: base.token_writer, src: base.io_reader) {
|
||||
}
|
||||
|
||||
return "#bad input"
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
pri func decoder.decode_trailing_new_line?(dst: base.token_writer, src: base.io_reader) {
|
||||
|
||||
@@ -100,7 +100,7 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf
|
||||
this.lm1s[i] = 0
|
||||
this.suffixes[i][0] = i as base.u8
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
|
||||
while true {
|
||||
this.read_from!(src: args.src)
|
||||
@@ -120,7 +120,7 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf
|
||||
} else {
|
||||
return "#internal error: inconsistent I/O"
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
pri func decoder.read_from!(src: base.io_reader) {
|
||||
@@ -265,7 +265,7 @@ pri func decoder.read_from!(src: base.io_reader) {
|
||||
// in practice, but is necessary for the overflow checker.
|
||||
o = (o ~mod- 8) & 8191
|
||||
c = this.prefixes[c] as base.u32
|
||||
}
|
||||
} endwhile
|
||||
first_byte = this.suffixes[c][0]
|
||||
|
||||
if code == save_code {
|
||||
@@ -306,7 +306,7 @@ pri func decoder.read_from!(src: base.io_reader) {
|
||||
this.read_from_return_value = 1
|
||||
break
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
|
||||
// Rewind args.src, if we're not in "$short read" and we've read too many
|
||||
// bits.
|
||||
@@ -319,7 +319,7 @@ pri func decoder.read_from!(src: base.io_reader) {
|
||||
this.read_from_return_value = 4
|
||||
break
|
||||
}
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
this.save_code = save_code
|
||||
@@ -347,7 +347,7 @@ pri func decoder.write_to?(dst: base.io_writer) {
|
||||
}
|
||||
this.output_ri = (this.output_ri ~mod+ ((n & 0xFFFF_FFFF) as base.u32)) & 8191
|
||||
yield? base."$short write"
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
pub func decoder.flush!() slice base.u8 {
|
||||
|
||||
@@ -46,7 +46,7 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_
|
||||
return "#bad header"
|
||||
}
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
|
||||
// Width, height.
|
||||
i = 0
|
||||
@@ -66,7 +66,7 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_
|
||||
return "#bad header"
|
||||
}
|
||||
x32 = x64 as base.u32
|
||||
}
|
||||
} endwhile
|
||||
|
||||
if i == 0 {
|
||||
this.width = x32
|
||||
@@ -74,7 +74,7 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_
|
||||
this.height = x32
|
||||
}
|
||||
i += 1
|
||||
}
|
||||
} endwhile
|
||||
|
||||
this.frame_config_io_position = args.src.position()
|
||||
|
||||
@@ -190,9 +190,9 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader,
|
||||
}
|
||||
|
||||
dst_x += 1
|
||||
}
|
||||
} endwhile
|
||||
dst_y += 1
|
||||
}
|
||||
} endwhile
|
||||
}
|
||||
|
||||
this.call_sequence = 3
|
||||
|
||||
@@ -117,7 +117,7 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf
|
||||
break
|
||||
}
|
||||
yield? status
|
||||
}
|
||||
} endwhile
|
||||
checksum_want = args.src.read_u32be?()
|
||||
if (not this.ignore_checksum) and (checksum_got <> checksum_want) {
|
||||
return "#bad checksum"
|
||||
|
||||
Reference in new issue
Block a user