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

+14 -19
View File
@@ -248,11 +248,6 @@ type Loop interface {
SetHasContinue()
}
type TailedLoop interface {
Loop
Tail() []*Node
}
type Raw Node
func (n *Raw) Node() *Node { return (*Node)(n) }
@@ -516,42 +511,42 @@ func NewIOBind(in_fields []*Node, body []*Node) *IOBind {
}
// Iterate is
// "iterate:ID1 (vars)(length:ID2, unroll:ID0), List1 { List2 } else { List3 }":
// "iterate:ID1 (vars)(length:ID2, unroll:ID0), List1 { List2 } else RHS":
// - FlagsHasBreak is the iterate has an explicit break
// - FlagsHasContinue is the iterate has an explicit continue
// - ID0: unroll
// - ID1: <0|label>
// - ID2: length
// - RHS: <nil|Iterate>
// - List0: <Var> vars
// - List1: <Assert> asserts
// - List2: <Statement> body
// - List3: <Statement> tail
type Iterate Node
func (n *Iterate) Node() *Node { return (*Node)(n) }
func (n *Iterate) HasBreak() bool { return n.flags&FlagsHasBreak != 0 }
func (n *Iterate) HasContinue() bool { return n.flags&FlagsHasContinue != 0 }
func (n *Iterate) Unroll() t.ID { return n.id0 }
func (n *Iterate) Label() t.ID { return n.id1 }
func (n *Iterate) Length() t.ID { return n.id2 }
func (n *Iterate) Variables() []*Node { return n.list0 }
func (n *Iterate) Asserts() []*Node { return n.list1 }
func (n *Iterate) Body() []*Node { return n.list2 }
func (n *Iterate) Tail() []*Node { return n.list3 }
func (n *Iterate) Node() *Node { return (*Node)(n) }
func (n *Iterate) HasBreak() bool { return n.flags&FlagsHasBreak != 0 }
func (n *Iterate) HasContinue() bool { return n.flags&FlagsHasContinue != 0 }
func (n *Iterate) Unroll() t.ID { return n.id0 }
func (n *Iterate) Label() t.ID { return n.id1 }
func (n *Iterate) Length() t.ID { return n.id2 }
func (n *Iterate) ElseIterate() *Iterate { return n.rhs.Iterate() }
func (n *Iterate) Variables() []*Node { return n.list0 }
func (n *Iterate) Asserts() []*Node { return n.list1 }
func (n *Iterate) Body() []*Node { return n.list2 }
func (n *Iterate) SetHasBreak() { n.flags |= FlagsHasBreak }
func (n *Iterate) SetHasContinue() { n.flags |= FlagsHasContinue }
func NewIterate(label t.ID, vars []*Node, length t.ID, unroll t.ID, asserts []*Node, body []*Node, tail []*Node) *Iterate {
func NewIterate(label t.ID, vars []*Node, length t.ID, unroll t.ID, asserts []*Node, body []*Node, elseIterate *Iterate) *Iterate {
return &Iterate{
kind: KIterate,
id0: unroll,
id1: label,
id2: length,
rhs: elseIterate.Node(),
list0: vars,
list1: asserts,
list2: body,
list3: tail,
}
}
+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
}
+12 -14
View File
@@ -727,7 +727,7 @@ func (p *parser) parseIf() (*a.If, error) {
func (p *parser) parseIterateNode() (*a.Node, error) {
if x := p.peek1(); x != t.IDIterate {
got := p.tm.ByID(x)
return nil, fmt.Errorf(`parse: expected "if", got %q at %s:%d`, got, p.filename, p.line())
return nil, fmt.Errorf(`parse: expected "iterate", got %q at %s:%d`, got, p.filename, p.line())
}
p.src = p.src[1:]
label, err := p.parseLabel()
@@ -738,7 +738,14 @@ func (p *parser) parseIterateNode() (*a.Node, error) {
if err != nil {
return nil, err
}
n, err := p.parseIterateBlock(label, vars)
if err != nil {
return nil, err
}
return n.Node(), nil
}
func (p *parser) parseIterateBlock(label t.ID, vars []*a.Node) (*a.Iterate, error) {
if x := p.peek1(); x != t.IDOpenParen {
got := p.tm.ByID(x)
return nil, fmt.Errorf(`parse: expected "(", got %q at %s:%d`, got, p.filename, p.line())
@@ -804,25 +811,16 @@ func (p *parser) parseIterateNode() (*a.Node, error) {
return nil, err
}
tail := ([]*a.Node)(nil)
if length == t.ID1 {
if x := p.peek1(); x == t.IDElse {
got := p.tm.ByID(x)
return nil, fmt.Errorf(`parse: expected non-"else", got %q at %s:%d`, got, p.filename, p.line())
}
} else {
if x := p.peek1(); x != t.IDElse {
got := p.tm.ByID(x)
return nil, fmt.Errorf(`parse: expected "else", got %q at %s:%d`, got, p.filename, p.line())
}
elseIterate := (*a.Iterate)(nil)
if x := p.peek1(); x == t.IDElse {
p.src = p.src[1:]
tail, err = p.parseBlock()
elseIterate, err = p.parseIterateBlock(0, nil)
if err != nil {
return nil, err
}
}
return a.NewIterate(label, vars, length, unroll, asserts, body, tail).Node(), nil
return a.NewIterate(label, vars, length, unroll, asserts, body, elseIterate), nil
}
func (p *parser) parseArgNode() (*a.Node, error) {