From 8a7dee5a4d919cf8bda9ded444b117d5202c766b Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 4 May 2017 15:12:02 +1000 Subject: [PATCH] Parse "f(i)". --- lang/ast/ast.go | 5 +++-- lang/parse/parse.go | 41 +++++++++++++++++++++++++---------------- lang/render/render.go | 13 +++++++++---- lang/token/list.go | 2 +- 4 files changed, 38 insertions(+), 23 deletions(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index c4b45092..04a7542f 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -15,11 +15,12 @@ type Kind uint32 const ( KInvalid = Kind(iota) - // KExpr is an expression, such as "i", "+j" or "k + l[m].n". + // KExpr is an expression, such as "i", "+j" or "k + l[m(n, o)].p". // - ID0: <0|operator|IDOpenParen|IDOpenBracket|IDDot> // - ID1: <0|identifier name|literal> // - LHS: // - RHS: + // - List0: function call arguments // // A zero ID0 means an identifier or literal in ID1, like "foo" or "42". // @@ -29,7 +30,7 @@ const ( // operands. The LHS may be null for the "-" and "+" operators, which are // also unary operators. // - // For function calls, like "lhs(rhs)", ID0 is IDOpenParen. + // For function calls, like "lhs(list0)", ID0 is IDOpenParen. // // For indexes, like "lhs[rhs]", ID0 is IDOpenBracket. // diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 6b6d1d7f..2f117e8d 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -69,7 +69,7 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { if err != nil { return nil, err } - inParams, err := p.parseParamList() + inParams, err := p.parseList("parameter", (*parser).parseParam) if err != nil { return nil, err } @@ -77,7 +77,7 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { flags |= a.FlagsSuspendible p.src = p.src[1:] } - outParams, err := p.parseParamList() + outParams, err := p.parseList("parameter", (*parser).parseParam) if err != nil { return nil, err } @@ -135,40 +135,40 @@ func (p *parser) parseIdent() (t.ID, error) { return x.ID, nil } -func (p *parser) parseParamList() ([]*a.Node, error) { +func (p *parser) parseList(element string, parseFunc func(*parser) (*a.Node, error)) ([]*a.Node, error) { if x := p.peekID(); x != t.IDOpenParen { got := p.m.ByKey(x.Key()) - return nil, fmt.Errorf("parse: expected \"(\", got %q for parameter list at %s:%d", - got, p.filename, p.line()) + return nil, fmt.Errorf("parse: expected \"(\", got %q for %s list at %s:%d", + got, element, p.filename, p.line()) } p.src = p.src[1:] - params := []*a.Node(nil) + ret := []*a.Node(nil) for len(p.src) > 0 { if p.src[0].ID == t.IDCloseParen { p.src = p.src[1:] - return params, nil + return ret, nil } - param, err := p.parseParam() + elem, err := parseFunc(p) if err != nil { return nil, err } - params = append(params, param) + ret = append(ret, elem) switch x := p.peekID(); x { case t.IDCloseParen: p.src = p.src[1:] - return params, nil + return ret, nil case t.IDComma: p.src = p.src[1:] default: got := p.m.ByKey(x.Key()) - return nil, fmt.Errorf("parse: expected \")\", got %q for parameter list at %s:%d", - got, p.filename, p.line()) + return nil, fmt.Errorf("parse: expected \")\", got %q for %s list at %s:%d", + got, element, p.filename, p.line()) } } - return nil, fmt.Errorf("parse: expected \")\" for parameter list at %s:%d", p.filename, p.line()) + return nil, fmt.Errorf("parse: expected \")\" for %s list at %s:%d", element, p.filename, p.line()) } func (p *parser) parseParam() (*a.Node, error) { @@ -343,7 +343,16 @@ func (p *parser) parseOperand() (*a.Node, error) { return lhs, nil case t.IDOpenParen: - // TODO: parse "f(i)". + list0, err := p.parseList("argument", (*parser).parseExpr) + if err != nil { + return nil, err + } + lhs = &a.Node{ + Kind: a.KExpr, + ID0: t.IDOpenParen, + LHS: lhs, + List0: list0, + } case t.IDOpenBracket: p.src = p.src[1:] @@ -356,12 +365,12 @@ func (p *parser) parseOperand() (*a.Node, error) { return nil, fmt.Errorf("parse: expected \"]\", got %q at %s:%d", got, p.filename, p.line()) } p.src = p.src[1:] - return &a.Node{ + lhs = &a.Node{ Kind: a.KExpr, ID0: t.IDOpenBracket, LHS: lhs, RHS: rhs, - }, nil + } case t.IDDot: p.src = p.src[1:] diff --git a/lang/render/render.go b/lang/render/render.go index cbd14af8..36535bdd 100644 --- a/lang/render/render.go +++ b/lang/render/render.go @@ -81,11 +81,16 @@ func RenderFile(w io.Writer, src []token.Token, m *token.IDMap) (err error) { // Render the lineTokens. numOpens := len(opens) - prevIsTightRight := true + prevID := token.ID(0) for _, t := range lineTokens { - if !t.IsTightLeft() && !prevIsTightRight { - buf = append(buf, ' ') + if prevID != 0 && !prevID.IsTightRight() && !t.IsTightLeft() { + // The "(" token's tight-left-ness is context dependent. For + // "f(x)", the "(" is tight-left. For "a * (b + c)", it is not. + if t.ID != token.IDOpenParen || prevID.IsBinaryOp() { + buf = append(buf, ' ') + } } + buf = append(buf, m.ByKey(t.Key())...) if t.IsOpen() { @@ -100,7 +105,7 @@ func RenderFile(w io.Writer, src []token.Token, m *token.IDMap) (err error) { opens = opens[:len(opens)-1] } - prevIsTightRight = t.IsTightRight() + prevID = t.ID } if numOpens != len(opens) { indent++ diff --git a/lang/token/list.go b/lang/token/list.go index 1bf9b786..21f54069 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -102,7 +102,7 @@ const ( IDDot = ID(0x20<