From badbdfc487a2e7cd263ee304025d7769d21b5fba Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 9 Dec 2018 09:13:29 +1100 Subject: [PATCH] Tweak io_bind syntax --- cmd/wuffs-c/internal/cgen/cgen.go | 5 +- cmd/wuffs-c/internal/cgen/statement.go | 15 ++---- lang/ast/ast.go | 22 ++++----- lang/check/bounds.go | 12 ++--- lang/check/type.go | 28 ++++------- lang/parse/parse.go | 66 ++++++++++++-------------- std/gif/decode_gif.wuffs | 2 +- 7 files changed, 62 insertions(+), 88 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 07c10f58..5242899f 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -173,9 +173,8 @@ const ( ) const ( - maxIOBinds = 100 - maxIOBindInFields = 100 - maxTemp = 10000 + maxIOBinds = 100 + maxTemp = 10000 ) type status struct { diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index c4746595..ba4325ba 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -225,12 +225,7 @@ func (g *gen) writeStatementAssign(b *buffer, } func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error { - inFields := n.InFields() - if n.Keyword() == t.IDIOLimit { - inFields = []*a.Node{n.IO().AsNode()} - } - - if g.currFunk.ioBinds > maxIOBinds || len(inFields) > maxIOBindInFields { + if g.currFunk.ioBinds > maxIOBinds { return fmt.Errorf("too many temporary variables required") } ioBindNum := g.currFunk.ioBinds @@ -240,8 +235,8 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error { // instead of block-scoped (smaller scope) if the coro_susp_point // switch can jump past this initialization?? b.writes("{\n") - for i := 0; i < len(inFields); i++ { - e := inFields[i].AsExpr() + { + e := n.IO() prefix := vPrefix if e.Operator() != 0 { prefix = aPrefix @@ -278,8 +273,8 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error { } } - for i := len(inFields) - 1; i >= 0; i-- { - e := inFields[i].AsExpr() + { + e := n.IO() prefix := vPrefix if e.Operator() != 0 { prefix = aPrefix diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 8c59d44f..b07f46c2 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -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: -// - LHS: +// - LHS: // - MHS: -// - List0: in.something fields // - List2: 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, } } diff --git a/lang/check/bounds.go b/lang/check/bounds.go index b57eae8e..2f79f74c 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -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 } diff --git a/lang/check/type.go b/lang/check/type.go index 4bfa4d57..5b9ef96f 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -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 } diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 5e3dcb34..49a57b04 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -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) { diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 23b5a583..16070f66 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -638,7 +638,7 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade while:inner true { var w base.io_writer - io_bind (w) { + io_bind (io:w) { w.set!(s:this.uncompressed[this.uncompressed_wi:]) io_limit (io:args.src, limit:block_size) { args.src.set_mark!()