Skip to content

Commit

Permalink
cmd/compile/internal/gc: don't ignore EOF in new parser
Browse files Browse the repository at this point in the history
Fixes #13274.
Fixes #13272.

Change-Id: Ie67a2c4671ee2b49831898fff7677cd65d780942
Reviewed-on: https://go-review.googlesource.com/16972
Reviewed-by: Chris Manghane <[email protected]>
  • Loading branch information
griesemer committed Nov 17, 2015
1 parent a20556b commit 0133d24
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/cmd/compile/internal/gc/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (p *parser) got(tok int32) bool {
}

func (p *parser) want(tok int32) {
if p.tok != EOF && !p.got(tok) {
if !p.got(tok) {
p.syntax_error("")
p.advance()
}
Expand Down Expand Up @@ -293,6 +293,8 @@ func (p *parser) file() {
}

xtop = concat(xtop, p.xdcl_list())

p.want(EOF)
}

// go.y:package
Expand Down
11 changes: 11 additions & 0 deletions test/fixedbugs/issue13274.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// errorcheck

// Copyright 2015 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// Check that we don't ignore EOF.

package p

var f = func() { // ERROR "unexpected EOF"

0 comments on commit 0133d24

Please sign in to comment.