diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 49404552..5e3abd61 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -576,13 +576,12 @@ func (q *checker) bcheckExpr(n *a.Expr, depth uint32) (*big.Int, *big.Int, error if err != nil { return nil, nil, err } - nMin, nMax := max(lMin, rMin), min(lMax, rMax) - // TODO: check if nMin > nMax. - // - // TODO: should it be a compile time error if "x as T" can narrow - // the range? Do we want a separate "~as" operator that ignores - // overflow? - return nMin, nMax, nil + if lMin.Cmp(rMin) < 0 || lMax.Cmp(rMax) > 0 { + return nil, nil, fmt.Errorf("check: expression %q bounds [%v..%v] is not within bounds [%v..%v]", + n.LHS().Expr().String(q.tm), lMin, lMax, rMin, rMax, + ) + } + return lMin, lMax, nil } return q.bcheckExprBinaryOp(n.LHS().Expr(), n.ID0().Key(), n.RHS().Expr(), depth) case t.FlagsAssociativeOp: diff --git a/std/gif/decode_lzw.puffs b/std/gif/decode_lzw.puffs index 39931cbf..939ba4bb 100644 --- a/std/gif/decode_lzw.puffs +++ b/std/gif/decode_lzw.puffs @@ -44,6 +44,7 @@ pub func lzw_decoder.decode?(dst ptr buf1, src ptr buf1, src_final bool)() { n_bits -= width if code < clear_code { + assert code < 256 via "a < b: a < c; c <= b"(c:clear_code) in.dst.write_u8?(x:code as u8) if use_save_code { this.suffixes[save_code] = code as u8