diff --git a/lang/check/assert.go b/lang/check/assert.go index 15a1ba66..1b6453ca 100644 --- a/lang/check/assert.go +++ b/lang/check/assert.go @@ -84,6 +84,15 @@ func (z *facts) appendFact(fact *a.Expr) { *z = append(*z, fact) } +func (z *facts) dropAnyFactsMentioning(n *a.Expr) error { + return z.update(func(x *a.Expr) (*a.Expr, error) { + if x.Mentions(n) { + return nil, nil + } + return x, nil + }) +} + // update applies f to each fact, replacing the slice element with the result // of the function call. The slice is then compacted to remove all nils. func (z *facts) update(f func(*a.Expr) (*a.Expr, error)) error { diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 68403dd2..89d21f16 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -275,10 +275,11 @@ func (q *checker) bcheckStatement(n *a.Node) error { return err } } + q.facts.dropAnyFactsMentioning(n.IO()) if err := q.bcheckBlock(n.Body()); err != nil { return err } - // TODO: invalidate any facts regarding the io_bind expressions. + q.facts.dropAnyFactsMentioning(n.IO()) case a.KIf: if err := q.bcheckIf(n.AsIf()); err != nil { @@ -509,13 +510,7 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { } if op == t.IDEq { - // Drop any facts involving lhs. - if err := q.facts.update(func(x *a.Expr) (*a.Expr, error) { - if x.Mentions(lhs) { - return nil, nil - } - return x, nil - }); err != nil { + if err := q.facts.dropAnyFactsMentioning(lhs); err != nil { return err }