From: Robert Griesemer <gri@golang.org>
Date: Thu, 21 Oct 2010 15:40:33 +0000 (-0700)
Subject: go/parser: consume auto-inserted semi when calling ParseExpr()
X-Git-Tag: weekly.2010-10-27~54
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b57b10f9926c93e5369d1f08900cb3f62d7be64e;p=gostls13.git

go/parser: consume auto-inserted semi when calling ParseExpr()

Fixes #1170.

R=rsc
CC=golang-dev
https://golang.org/cl/2622041
---

diff --git a/src/pkg/go/parser/interface.go b/src/pkg/go/parser/interface.go
index 39476f0720..e451a4fe3d 100644
--- a/src/pkg/go/parser/interface.go
+++ b/src/pkg/go/parser/interface.go
@@ -69,7 +69,11 @@ func ParseExpr(filename string, src interface{}) (ast.Expr, os.Error) {
 
 	var p parser
 	p.init(filename, data, 0)
-	return p.parseExpr(), p.parseEOF()
+	x := p.parseExpr()
+	if p.tok == token.SEMICOLON {
+		p.next() // consume automatically inserted semicolon, if any
+	}
+	return x, p.parseEOF()
 }