From 0133d24c9410a9b1f3e41925efd5d1c977dd57d6 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Mon, 16 Nov 2015 12:29:55 -0800 Subject: [PATCH] cmd/compile/internal/gc: don't ignore EOF in new parser Fixes #13274. Fixes #13272. Change-Id: Ie67a2c4671ee2b49831898fff7677cd65d780942 Reviewed-on: https://go-review.googlesource.com/16972 Reviewed-by: Chris Manghane --- src/cmd/compile/internal/gc/parser.go | 4 +++- test/fixedbugs/issue13274.go | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 test/fixedbugs/issue13274.go diff --git a/src/cmd/compile/internal/gc/parser.go b/src/cmd/compile/internal/gc/parser.go index d2b382fdfc..1d24b271e0 100644 --- a/src/cmd/compile/internal/gc/parser.go +++ b/src/cmd/compile/internal/gc/parser.go @@ -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() } @@ -293,6 +293,8 @@ func (p *parser) file() { } xtop = concat(xtop, p.xdcl_list()) + + p.want(EOF) } // go.y:package diff --git a/test/fixedbugs/issue13274.go b/test/fixedbugs/issue13274.go new file mode 100644 index 0000000000..a93c63fb91 --- /dev/null +++ b/test/fixedbugs/issue13274.go @@ -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" \ No newline at end of file