From 9d3c8b30f1a97bb6848ca63d42341718882355f3 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 4 May 2017 14:10:18 +1000 Subject: [PATCH] Parse "(x + y)". --- lang/parse/parse.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 7d727f3c..98e3c7f0 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -296,7 +296,17 @@ func (p *parser) parseExpr() (*a.Node, error) { func (p *parser) parseOperand() (*a.Node, error) { switch x := p.peekID(); { case x == t.IDOpenParen: - // TODO: parse "(x + y)". + p.src = p.src[1:] + expr, err := p.parseExpr() + if err != nil { + return nil, err + } + if x := p.peekID(); x != t.IDCloseParen { + got := p.m.ByKey(x.Key()) + return nil, fmt.Errorf("parse: expected \")\", got %q at %s:%d", got, p.filename, p.line()) + } + p.src = p.src[1:] + return expr, nil case x.IsUnaryOp(): p.src = p.src[1:]