diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 69895ee9..c2b60b5d 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -58,6 +58,9 @@ func init() { } } +// TODO: a collection of forbidden variable names like and, or, not, as, ref, +// deref, false, true, in, out, this, u8, u16, etc? + func TrimQuotes(s string) string { if len(s) >= 2 && s[0] == '"' && s[len(s)-1] == '"' { return s[1 : len(s)-1] diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 94337e1f..1c551265 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -232,8 +232,16 @@ loop: } // o is a yield statement. // - // TODO: invalidate this-, in- and out-related facts because the - // suspension can change the state of this and its fields. + // Drop any facts involving in, out or this. + if err := q.facts.update(func(x *a.Expr) (*a.Expr, error) { + if x.Mentions(exprIn) || x.Mentions(exprOut) || x.Mentions(exprThis) { + return nil, nil + } + return x, nil + }); err != nil { + return err + } + // TODO: drop any facts involving ptr-typed local variables? } } return nil diff --git a/lang/check/check.go b/lang/check/check.go index fa956faa..d3c19671 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -59,6 +59,12 @@ func (e *Error) Error() string { return string(b) } +var ( + exprIn = a.NewExpr(a.FlagsTypeChecked, 0, t.IDIn, nil, nil, nil, nil) + exprOut = a.NewExpr(a.FlagsTypeChecked, 0, t.IDOut, nil, nil, nil, nil) + exprThis = a.NewExpr(a.FlagsTypeChecked, 0, t.IDThis, nil, nil, nil, nil) +) + // typeExprFoo is an *ast.Node MType (implicit type). var ( typeExprBool = a.NewTypeExpr(0, t.IDBool, nil, nil, nil) diff --git a/std/flate/decode_huffman_slow.wuffs b/std/flate/decode_huffman_slow.wuffs index c6984f35..2b3be54b 100644 --- a/std/flate/decode_huffman_slow.wuffs +++ b/std/flate/decode_huffman_slow.wuffs @@ -213,8 +213,6 @@ pri func flate_decoder.decode_huffman_slow?(dst writer1, src reader1)() { } // TODO: "closed for writes" instead? yield suspension "short write" - // TODO: invalidate this-related facts because the - // suspension can change the state of this and its fields. } // Copy from the start of this.history, if we wrapped around. if hlen > 0 {