aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2010-12-06 15:34:23 -0800
committerRobert Griesemer <gri@golang.org>2010-12-06 15:34:23 -0800
commit2fd2991eac8866fa72b6f160d3425727de6f200d (patch)
treee58af69a3ebcc414cdd6cc74a0e8fe8e94d5ab3c
parent5a9ad8b9e3a5835c3dc051fff97c1d81844260f6 (diff)
downloadgo-2fd2991eac8866fa72b6f160d3425727de6f200d.tar.gz
go-2fd2991eac8866fa72b6f160d3425727de6f200d.zip
godoc: don't call flush if position is not valid
(fixes new godoc crash when looking at spec) R=rsc, r, iant CC=golang-dev https://golang.org/cl/3488041
-rw-r--r--src/cmd/godoc/spec.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cmd/godoc/spec.go b/src/cmd/godoc/spec.go
index df36caaa72..b1c1a883f7 100644
--- a/src/cmd/godoc/spec.go
+++ b/src/cmd/godoc/spec.go
@@ -39,7 +39,9 @@ func (p *ebnfParser) flush() {
func (p *ebnfParser) next() {
- p.flush()
+ if p.pos.IsValid() {
+ p.flush()
+ }
p.pos, p.tok, p.lit = p.scanner.Scan()
if p.tok.IsKeyword() {
// TODO Should keyword mapping always happen outside scanner?