From c450bca4a43ea59661ecfbed82afe18f62e2e760 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 6 May 2017 11:46:43 +1000 Subject: [PATCH] Parse "return", not just "return x". --- lang/ast/ast.go | 2 +- lang/parse/parse.go | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index dfd5b1fa..fa911251 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -74,7 +74,7 @@ const ( KIf // KReturn is "return LHS": - // - LHS: + // - LHS: KReturn // KBreak is "break": diff --git a/lang/parse/parse.go b/lang/parse/parse.go index ade9b0e5..4bd81ca4 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -419,9 +419,12 @@ func (p *parser) parseStatement() (*a.Node, error) { case t.IDReturn: p.src = p.src[1:] - lhs, err := p.parseExpr() - if err != nil { - return nil, err + lhs, err := (*a.Node)(nil), error(nil) + if p.peekID() != t.IDSemicolon { + lhs, err = p.parseExpr() + if err != nil { + return nil, err + } } return &a.Node{ Kind: a.KReturn,