gc: tweak error messages, avoid internalization settings in bison

R=r
CC=golang-dev
https://golang.org/cl/194129

8 files changed, 8 insertions, 8 deletions

diff --git a/test/syntax/import.go b/test/syntax/import.go
index 90e7df007e..dd1f261344 100644
--- a/test/syntax/import.go
+++ b/test/syntax/import.go
@@ -7,7 +7,7 @@
 package main
 
 import (
-	"io",	// ERROR "unexpected ,"
+	"io",	// ERROR "unexpected comma"
 	"os"
 )
 
diff --git a/test/syntax/semi1.go b/test/syntax/semi1.go
index c805bb0064..5ec776bba6 100644
--- a/test/syntax/semi1.go
+++ b/test/syntax/semi1.go
@@ -7,7 +7,7 @@
 package main
 
 func main() {
-	if x; y	// ERROR "unexpected ; or newline before {"
+	if x; y	// ERROR "unexpected semicolon or newline before {"
 	{
 		z
 
diff --git a/test/syntax/semi2.go b/test/syntax/semi2.go
index 237fac8f3b..14800a33e7 100644
--- a/test/syntax/semi2.go
+++ b/test/syntax/semi2.go
@@ -7,7 +7,7 @@
 package main
 
 func main() {
-	switch x; y	// ERROR "unexpected ; or newline before {"
+	switch x; y	// ERROR "unexpected semicolon or newline before {"
 	{
 		z
 
diff --git a/test/syntax/semi3.go b/test/syntax/semi3.go
index 2dbcb59843..d8e037fdc0 100644
--- a/test/syntax/semi3.go
+++ b/test/syntax/semi3.go
@@ -7,7 +7,7 @@
 package main
 
 func main() {
-	for x; y; z	// ERROR "unexpected ; or newline before {"
+	for x; y; z	// ERROR "unexpected semicolon or newline before {"
 	{
 		z
 
diff --git a/test/syntax/semi4.go b/test/syntax/semi4.go
index 2268cf75af..81134c19b4 100644
--- a/test/syntax/semi4.go
+++ b/test/syntax/semi4.go
@@ -8,7 +8,7 @@ package main
 
 func main() {
 	for x
-	{	// ERROR "unexpected ; or newline before {"
+	{	// ERROR "unexpected semicolon or newline before {"
 		z
 
 
diff --git a/test/syntax/semi5.go b/test/syntax/semi5.go
index 7f907fb8f8..0ba4df8d6d 100644
--- a/test/syntax/semi5.go
+++ b/test/syntax/semi5.go
@@ -7,7 +7,7 @@
 package main
 
 func main()
-{	// ERROR "unexpected ; or newline before {"
+{	// ERROR "unexpected semicolon or newline before {"
 
 
 
diff --git a/test/syntax/semi6.go b/test/syntax/semi6.go
index 75de3e0a15..b6279ed307 100644
--- a/test/syntax/semi6.go
+++ b/test/syntax/semi6.go
@@ -6,7 +6,7 @@
 
 package main
 
-type T	// ERROR "unexpected ; or newline in type declaration"
+type T	// ERROR "unexpected semicolon or newline in type declaration"
 {
 
 
diff --git a/test/syntax/semi7.go b/test/syntax/semi7.go
index 4589043575..a4271ddc5c 100644
--- a/test/syntax/semi7.go
+++ b/test/syntax/semi7.go
@@ -8,7 +8,7 @@ package main
 
 func main() {
 	if x { }
-	else { }	// ERROR "unexpected ; or newline before else"
+	else { }	// ERROR "unexpected semicolon or newline before else"
 }