From 6f9ad723306ae8b8e8b0649b0ec5f99972fe4f6c Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 4 May 2017 18:07:21 +1000 Subject: [PATCH] Parse "x += y". Also run gofmt. --- lang/ast/ast.go | 3 ++- lang/parse/parse.go | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index a3caf238..7b20427e 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -41,7 +41,8 @@ const ( // - RHS: KAssert - // KAssign is "LHS = RHS": + // KAssign is "LHS = RHS" or "LHS op= RHS: + // - ID0: operator // - LHS: // - RHS: KAssign diff --git a/lang/parse/parse.go b/lang/parse/parse.go index b14fda6f..222d2fed 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -316,8 +316,8 @@ func (p *parser) parseStatement() (*a.Node, error) { return nil, err } return &a.Node{ - Kind: a.KFor, - LHS: lhs, + Kind: a.KFor, + LHS: lhs, List2: block, }, nil } @@ -327,9 +327,11 @@ func (p *parser) parseStatement() (*a.Node, error) { return nil, err } - if x := p.peekID(); x != t.IDEq { - got := p.m.ByKey(x.Key()) - return nil, fmt.Errorf("parse: expected \"=\", got %q for statement at %s:%d", got, p.filename, p.line()) + op := p.peekID() + if !op.IsAssign() { + got := p.m.ByKey(op.Key()) + return nil, fmt.Errorf("parse: expected assignment, got %q for statement at %s:%d", + got, p.filename, p.line()) } p.src = p.src[1:] @@ -340,6 +342,7 @@ func (p *parser) parseStatement() (*a.Node, error) { return &a.Node{ Kind: a.KAssign, + ID0: op, LHS: lhs, RHS: rhs, }, nil