Make the else-length-1 iterate tail explicit

This commit is contained in:
Nigel Tao committed 2018-05-11 10:22:24 +10:00
1 parent bfff18fd64
commit b65fdee306
6 files changed
+65 -92

No files matched your search

+3 -17
View File
@@ -299,10 +299,10 @@ func (q *checker) bcheckStatement(n *a.Node) error {
// execute-exactly-once block. We should have pre / inv / post
// conditions, a la bcheckWhile.
// Check the body.
{
variables := n.Variables()
for ; n != nil; n = n.ElseIterate() {
q.facts = q.facts[:0]
for _, o := range n.Variables() {
for _, o := range variables {
v := o.Var()
q.facts = append(q.facts, makeSliceLengthEqEq(v.Name(), v.XType(), n.Length()))
}
@@ -313,20 +313,6 @@ func (q *checker) bcheckStatement(n *a.Node) error {
}
}
// Check the tail.
{
q.facts = q.facts[:0]
for _, o := range n.Variables() {
v := o.Var()
q.facts = append(q.facts, makeSliceLengthEqEq(v.Name(), v.XType(), t.ID1))
}
for _, o := range n.Tail() {
if err := q.bcheckStatement(o); err != nil {
return err
}
}
}
q.facts = q.facts[:0]
return nil
+19 -22
View File
@@ -45,14 +45,13 @@ func (q *checker) tcheckVars(block []*a.Node) error {
}
case a.KIterate:
if err := q.tcheckVars(o.Iterate().Variables()); err != nil {
return err
}
if err := q.tcheckVars(o.Iterate().Body()); err != nil {
return err
}
if err := q.tcheckVars(o.Iterate().Tail()); err != nil {
return err
for o := o.Iterate(); o != nil; o = o.ElseIterate() {
if err := q.tcheckVars(o.Variables()); err != nil {
return err
}
if err := q.tcheckVars(o.Body()); err != nil {
return err
}
}
case a.KVar:
@@ -144,17 +143,22 @@ func (q *checker) tcheckStatement(n *a.Node) error {
}
case a.KIterate:
n := n.Iterate()
for _, o := range n.Variables() {
if err := q.tcheckStatement(o); err != nil {
for n := n.Iterate(); n != nil; n = n.ElseIterate() {
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
}
}
// 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
for n := n.Iterate(); n != nil; n = n.ElseIterate() {
n.Node().SetTypeChecked()
}
return nil
case a.KJump:
n := n.Jump()
@@ -364,13 +368,6 @@ 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
}