Tweak io_bind syntax

This commit is contained in:
Nigel Tao committed 2018-12-09 09:13:29 +11:00
1 parent e992921dce
commit badbdfc487
7 files changed
+62 -88

No files matched your search

+9 -13
View File
@@ -482,30 +482,26 @@ func NewField(name t.ID, xType *TypeExpr) *Field {
}
}
// IOBind is "io_bind (in_fields) { List2 }" or "io_limit (io:LHS, limit:MHS)":
// IOBind is "io_bind (io:LHS) { List2 }" or "io_limit (io:LHS, limit:MHS) {
// List2 }":
// - ID0: <IDIOBind|IDIOLimit>
// - LHS: <nil|Expr>
// - LHS: <Expr>
// - MHS: <nil|Expr>
// - List0: <Expr> in.something fields
// - List2: <Statement> body
//
// TODO: in_fields and "in.something" isn't right.
type IOBind Node
func (n *IOBind) AsNode() *Node { return (*Node)(n) }
func (n *IOBind) Keyword() t.ID { return n.id0 }
func (n *IOBind) IO() *Expr { return n.lhs.AsExpr() }
func (n *IOBind) Limit() *Expr { return n.mhs.AsExpr() }
func (n *IOBind) InFields() []*Node { return n.list0 }
func (n *IOBind) Body() []*Node { return n.list2 }
func (n *IOBind) AsNode() *Node { return (*Node)(n) }
func (n *IOBind) Keyword() t.ID { return n.id0 }
func (n *IOBind) IO() *Expr { return n.lhs.AsExpr() }
func (n *IOBind) Limit() *Expr { return n.mhs.AsExpr() }
func (n *IOBind) Body() []*Node { return n.list2 }
func NewIOBind(keyword t.ID, io *Expr, limit *Expr, in_fields []*Node, body []*Node) *IOBind {
func NewIOBind(keyword t.ID, io *Expr, limit *Expr, body []*Node) *IOBind {
return &IOBind{
kind: KIOBind,
id0: keyword,
lhs: io.AsNode(),
mhs: limit.AsNode(),
list0: in_fields,
list2: body,
}
}
+4 -8
View File
@@ -234,16 +234,12 @@ func (q *checker) bcheckStatement(n *a.Node) error {
case a.KIOBind:
n := n.AsIOBind()
if _, err := q.bcheckExpr(n.IO(), 0); err != nil {
return err
}
if n.Keyword() == t.IDIOBind {
for _, o := range n.InFields() {
if _, err := q.bcheckExpr(o.AsExpr(), 0); err != nil {
return err
}
}
// No-op.
} else {
if _, err := q.bcheckExpr(n.IO(), 0); err != nil {
return err
}
if _, err := q.bcheckExpr(n.Limit(), 0); err != nil {
return err
}
+10 -18
View File
@@ -120,25 +120,17 @@ func (q *checker) tcheckStatement(n *a.Node) error {
case a.KIOBind:
n := n.AsIOBind()
if n.Keyword() == t.IDIOBind {
for _, o := range n.InFields() {
if err := q.tcheckExpr(o.AsExpr(), 0); err != nil {
return err
}
if typ := o.AsExpr().MType(); !typ.IsIOType() {
return fmt.Errorf("check: io_bind expression %q, of type %q, does not have an I/O type",
o.AsExpr().Str(q.tm), typ.Str(q.tm))
}
}
} else {
if err := q.tcheckExpr(n.IO(), 0); err != nil {
return err
}
if typ := n.IO().MType(); !typ.IsIOType() {
return fmt.Errorf("check: %s expression %q, of type %q, does not have an I/O type",
n.Keyword().Str(q.tm), n.IO().Str(q.tm), typ.Str(q.tm))
}
if err := q.tcheckExpr(n.IO(), 0); err != nil {
return err
}
if typ := n.IO().MType(); !typ.IsIOType() {
return fmt.Errorf("check: %s expression %q, of type %q, does not have an I/O type",
n.Keyword().Str(q.tm), n.IO().Str(q.tm), typ.Str(q.tm))
}
if n.Keyword() == t.IDIOBind {
// No-op.
} else {
if err := q.tcheckExpr(n.Limit(), 0); err != nil {
return err
}
+31 -35
View File
@@ -669,18 +669,7 @@ func (p *parser) parseAsserts() ([]*a.Node, error) {
}
func (p *parser) parseIOBindNode() (*a.Node, error) {
if p.peek1() == t.IDIOBind {
p.src = p.src[1:]
in_fields, err := p.parseList(t.IDCloseParen, (*parser).parseIOBindExprNode)
if err != nil {
return nil, err
}
body, err := p.parseBlock()
if err != nil {
return nil, err
}
return a.NewIOBind(t.IDIOBind, nil, nil, in_fields, body).AsNode(), nil
}
keyword := p.peek1()
p.src = p.src[1:]
if x := p.peek1(); x != t.IDOpenParen {
@@ -710,31 +699,38 @@ func (p *parser) parseIOBindNode() (*a.Node, error) {
io.Str(p.tm), p.filename, p.line())
}
if x := p.peek1(); x != t.IDComma {
got := p.tm.ByID(x)
return nil, fmt.Errorf(`parse: expected ",", got %q at %s:%d`, got, p.filename, p.line())
}
p.src = p.src[1:]
limit := (*a.Expr)(nil)
if keyword == t.IDIOBind {
// No-op.
if x := p.peek1(); x != t.IDLimit {
got := p.tm.ByID(x)
return nil, fmt.Errorf(`parse: expected "limit", got %q at %s:%d`, got, p.filename, p.line())
}
p.src = p.src[1:]
} else {
if x := p.peek1(); x != t.IDComma {
got := p.tm.ByID(x)
return nil, fmt.Errorf(`parse: expected ",", got %q at %s:%d`, got, p.filename, p.line())
}
p.src = p.src[1:]
if x := p.peek1(); x != t.IDColon {
got := p.tm.ByID(x)
return nil, fmt.Errorf(`parse: expected ":", got %q at %s:%d`, got, p.filename, p.line())
}
p.src = p.src[1:]
if x := p.peek1(); x != t.IDLimit {
got := p.tm.ByID(x)
return nil, fmt.Errorf(`parse: expected "limit", got %q at %s:%d`, got, p.filename, p.line())
}
p.src = p.src[1:]
limit, err := p.parseExpr()
if err != nil {
return nil, err
}
if limit.Effect() != 0 {
return nil, fmt.Errorf(`parse: argument %q is not effect-free at %s:%d`,
io.Str(p.tm), p.filename, p.line())
if x := p.peek1(); x != t.IDColon {
got := p.tm.ByID(x)
return nil, fmt.Errorf(`parse: expected ":", got %q at %s:%d`, got, p.filename, p.line())
}
p.src = p.src[1:]
var err error
limit, err = p.parseExpr()
if err != nil {
return nil, err
}
if limit.Effect() != 0 {
return nil, fmt.Errorf(`parse: argument %q is not effect-free at %s:%d`,
io.Str(p.tm), p.filename, p.line())
}
}
if x := p.peek1(); x != t.IDCloseParen {
@@ -748,7 +744,7 @@ func (p *parser) parseIOBindNode() (*a.Node, error) {
return nil, err
}
return a.NewIOBind(t.IDIOLimit, io, limit, nil, body).AsNode(), nil
return a.NewIOBind(keyword, io, limit, body).AsNode(), nil
}
func (p *parser) parseIf() (*a.If, error) {