Add an iterate step argument

This commit is contained in:
Nigel Tao committed 2018-05-03 22:34:24 +10:00
1 parent 92682e6ccc
commit a73e56712d
9 files changed
+120 -57

No files matched your search

+16 -3
View File
@@ -291,18 +291,26 @@ func (q *checker) bcheckStatement(n *a.Node) error {
case a.KIterate:
n := n.Iterate()
for _, o := range n.Variables() {
if err := q.bcheckVar(o.Var()); err != nil {
if err := q.bcheckVar(o.Var(), true); err != nil {
return err
}
}
// TODO: this isn't right, as the body is a loop, not an
// execute-exactly-once block. We should have pre / inv / post
// conditions, a la bcheckWhile.
q.facts = q.facts[:0]
for _, o := range n.Body() {
if err := q.bcheckStatement(o); err != nil {
return err
}
}
q.facts = q.facts[:0]
for _, o := range n.Tail() {
if err := q.bcheckStatement(o); err != nil {
return err
}
}
q.facts = q.facts[:0]
return nil
case a.KJump:
@@ -326,7 +334,7 @@ func (q *checker) bcheckStatement(n *a.Node) error {
// TODO.
case a.KVar:
return q.bcheckVar(n.Var())
return q.bcheckVar(n.Var(), false)
case a.KWhile:
return q.bcheckWhile(n.While())
@@ -715,12 +723,17 @@ func (q *checker) bcheckWhile(n *a.While) error {
return nil
}
func (q *checker) bcheckVar(n *a.Var) error {
func (q *checker) bcheckVar(n *a.Var, iterateVariable bool) error {
if innTyp := n.XType().Innermost(); innTyp.IsRefined() {
if _, _, err := typeBounds(q.tm, innTyp); err != nil {
return err
}
}
if iterateVariable {
// TODO.
return nil
}
lhs := a.NewExpr(a.FlagsTypeChecked, 0, 0, n.Name(), nil, nil, nil, nil)
lhs.SetMType(n.XType())
rhs := n.Value()
+12 -7
View File
@@ -51,6 +51,9 @@ func (q *checker) tcheckVars(block []*a.Node) error {
if err := q.tcheckVars(o.Iterate().Body()); err != nil {
return err
}
if err := q.tcheckVars(o.Iterate().Tail()); err != nil {
return err
}
case a.KVar:
o := o.Var()
@@ -142,18 +145,13 @@ func (q *checker) tcheckStatement(n *a.Node) error {
case a.KIterate:
n := n.Iterate()
unroll := n.UnrollCount()
if err := q.tcheckExpr(unroll, 0); err != nil {
return err
}
if cv := unroll.ConstValue(); cv == nil {
return fmt.Errorf("check: unroll count %q is not constant", unroll.Str(q.tm))
}
for _, o := range n.Variables() {
if err := q.tcheckStatement(o); err != nil {
return err
}
}
// TODO: prohibit jumps (breaks, continues), rets (returns, yields) and
// retry-calling ? methods while inside an iterate body.
if err := q.tcheckLoop(n); err != nil {
return err
}
@@ -370,6 +368,13 @@ func (q *checker) tcheckLoop(n a.Loop) error {
return err
}
}
if n, ok := n.(a.TailedLoop); ok {
for _, o := range n.Tail() {
if err := q.tcheckStatement(o); err != nil {
return err
}
}
}
return nil
}