From a20556bf565f2b98e9f54f287b5f3e0a929dacf9 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Mon, 16 Nov 2015 11:24:43 -0800 Subject: [PATCH] cmd/compile/internal/gc: correctly use internal call to error reporting Fixes #13266. Change-Id: I31da922e0599989e52acf346374c2077b157ebb7 Reviewed-on: https://go-review.googlesource.com/16971 Reviewed-by: Chris Manghane --- src/cmd/compile/internal/gc/parser.go | 6 +++--- test/fixedbugs/issue13266.go | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 test/fixedbugs/issue13266.go diff --git a/src/cmd/compile/internal/gc/parser.go b/src/cmd/compile/internal/gc/parser.go index c8a682680d..d2b382fdfc 100644 --- a/src/cmd/compile/internal/gc/parser.go +++ b/src/cmd/compile/internal/gc/parser.go @@ -116,7 +116,7 @@ func (p *parser) syntax_error(msg string) { msg = ", " + msg default: // plain error - we don't care about current token - Yyerror("syntax error: " + msg) + Yyerror("syntax error: %s", msg) return } @@ -138,7 +138,7 @@ func (p *parser) syntax_error(msg string) { tok = tokstring(p.tok) } - Yyerror("syntax error: unexpected " + tok + msg) + Yyerror("syntax error: unexpected %s", tok + msg) } // Advance consumes tokens until it finds a token of the stoplist. @@ -1669,7 +1669,7 @@ func (p *parser) sym() *Sym { return nil default: - p.syntax_error("") + p.syntax_error("expecting name") p.advance() return new(Sym) } diff --git a/test/fixedbugs/issue13266.go b/test/fixedbugs/issue13266.go new file mode 100644 index 0000000000..3c4f74b4ff --- /dev/null +++ b/test/fixedbugs/issue13266.go @@ -0,0 +1,10 @@ +// 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. + +// Offending character % must not be interpreted as +// start of format verb when emitting error message. + +package% // ERROR "unexpected %"