From: Russ Cox <rsc@golang.org>
Date: Tue, 24 Feb 2015 15:21:14 +0000 (-0500)
Subject: cmd/internal/gc: restore detail in plain syntax errors
X-Git-Tag: go1.5beta1~1848
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f716c5c5bb814090503eebe15699a3068a55b296;p=gostls13.git

cmd/internal/gc: restore detail in plain syntax errors

Change-Id: Ifc4b25fa57d0c9242968246d2193aa29f6b87700
Reviewed-on: https://go-review.googlesource.com/5950
Reviewed-by: Austin Clements <austin@google.com>
---

diff --git a/src/cmd/internal/gc/subr.go b/src/cmd/internal/gc/subr.go
index b970f1d21a..998b3e7ebf 100644
--- a/src/cmd/internal/gc/subr.go
+++ b/src/cmd/internal/gc/subr.go
@@ -127,8 +127,12 @@ var yychar_subr int
 var yyerror_lastsyntax int
 
 func Yyerror(fmt_ string, args ...interface{}) {
+	// bison used to invoke yyerror("syntax error").
+	// With Go yacc we get yyerror("%s", "syntax error").
+	// Convert to keep the old code working.
 	if fmt_ == "%s" && len(args) == 1 && args[0] == "syntax error" {
-		nsyntaxerrors++
+		fmt_ = "syntax error"
+		args = nil
 	}
 	if strings.HasPrefix(fmt_, "syntax error") {
 		nsyntaxerrors++