diff options
| author | Robert Griesemer <gri@golang.org> | 2010-10-21 08:40:33 -0700 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2010-10-21 08:40:33 -0700 |
| commit | b57b10f9926c93e5369d1f08900cb3f62d7be64e (patch) | |
| tree | ee891c38cdef79e9077c55f72400336a9b1dc5f2 /src/pkg | |
| parent | 49084db386604586817d396a2b54aa1f7cffa27c (diff) | |
| download | go-b57b10f9926c93e5369d1f08900cb3f62d7be64e.tar.xz | |
go/parser: consume auto-inserted semi when calling ParseExpr()
Fixes #1170.
R=rsc
CC=golang-dev
https://golang.org/cl/2622041
Diffstat (limited to 'src/pkg')
| -rw-r--r-- | src/pkg/go/parser/interface.go | 6 |
1 files changed, 5 insertions, 1 deletions
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() } |