diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 602ff14b..7779f6e2 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -240,6 +240,7 @@ type Loop interface { AsNode() *Node HasBreak() bool HasContinue() bool + Keyword() t.ID Label() t.ID Asserts() []*Node Body() []*Node @@ -513,6 +514,7 @@ type Iterate Node func (n *Iterate) AsNode() *Node { return (*Node)(n) } func (n *Iterate) HasBreak() bool { return n.flags&FlagsHasBreak != 0 } func (n *Iterate) HasContinue() bool { return n.flags&FlagsHasContinue != 0 } +func (n *Iterate) Keyword() t.ID { return t.IDIterate } func (n *Iterate) Unroll() t.ID { return n.id0 } func (n *Iterate) Label() t.ID { return n.id1 } func (n *Iterate) Length() t.ID { return n.id2 } @@ -551,6 +553,7 @@ type While Node func (n *While) AsNode() *Node { return (*Node)(n) } func (n *While) HasBreak() bool { return n.flags&FlagsHasBreak != 0 } func (n *While) HasContinue() bool { return n.flags&FlagsHasContinue != 0 } +func (n *While) Keyword() t.ID { return t.IDWhile } func (n *While) Label() t.ID { return n.id1 } func (n *While) Condition() *Expr { return n.mhs.AsExpr() } func (n *While) Asserts() []*Node { return n.list1 } diff --git a/lang/check/type.go b/lang/check/type.go index 039e6639..50da53ad 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -151,13 +151,17 @@ func (q *checker) tcheckStatement(n *a.Node) error { } } else if nj := len(q.jumpTargets); nj > 0 { jumpTarget = q.jumpTargets[nj-1] + if jumpTarget.Label() != 0 { + return fmt.Errorf("check: unlabeled %s for labeled %s.%s", + n.Keyword().Str(q.tm), jumpTarget.Keyword().Str(q.tm), jumpTarget.Label().Str(q.tm)) + } } if jumpTarget == nil { sepStr, labelStr := "", "" if id := n.Label(); id != 0 { sepStr, labelStr = ":", id.Str(q.tm) } - return fmt.Errorf("no matching while/iterate statement for %s%s%s", + return fmt.Errorf("check: no matching while/iterate statement for %s%s%s", n.Keyword().Str(q.tm), sepStr, labelStr) } if n.Keyword() == t.IDBreak { diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index 4e2dcb14..a293e28b 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -225,7 +225,7 @@ pri func decoder.decode_blocks?(dst: base.io_writer, src: base.io_reader) { if type == 0 { this.decode_uncompressed?(dst: args.dst, src: args.src) - continue + continue.outer } else if type == 1 { status = this.init_fixed_huffman!() // TODO: "if status.is_error()" is probably more idiomatic, but for diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 62f3a7e4..4f987711 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -927,7 +927,7 @@ pri func decoder.decode_id_part2?(dst: ptr base.pixel_buffer, src: base.io_reade block_size = args.src.read_u8_as_u64?() } if block_size == 0 { - break + break.outer } while args.src.available() == 0 { yield? base."$short read"