gc: more accurate error description

R=ken2
CC=golang-dev
https://golang.org/cl/1284041

diff --git a/src/cmd/gc/go.errors b/src/cmd/gc/go.errors
index be11c74164896ecd21217bae8daa0f51d5aa3d14..cdd7578d414325b97d305c6880f9fe9036eaf3d6 100644 (file)
--- a/src/cmd/gc/go.errors
+++ b/src/cmd/gc/go.errors
@@ -45,10 +45,10 @@ static struct {
        "var declaration not allowed in for initializer",
 
        % loadsys package imports LVAR LNAME '[' ']' LNAME '{'
-       "var declaration missing = before initial value",
+       "unexpected { at end of statement",
 
        % loadsys package imports LFUNC LNAME '(' ')' '{' LVAR LNAME '[' ']' LNAME '{'
-       "var declaration missing = before initial value",
+       "unexpected { at end of statement",
        
        % loadsys package imports LFUNC LNAME '(' ')' '{' LDEFER LNAME ';'
        "argument to go/defer must be function call",

diff --git a/test/syntax/vareq.go b/test/syntax/vareq.go
index ef15fe5cde08f126f4f76d72fed2d275477e0415..9be03c1d3b99c248fc2f82e115b86deca7e7d44b 100644 (file)
--- a/test/syntax/vareq.go
+++ b/test/syntax/vareq.go
@@ -7,4 +7,4 @@
 package main
 
 func main() {
-       var x map[string]string{"a":"b"}                // ERROR "var declaration missing ="
+       var x map[string]string{"a":"b"}                // ERROR "unexpected { at end of statement"

diff --git a/test/syntax/vareq1.go b/test/syntax/vareq1.go
index 4697d018f79ab33c563faeb8b1165fccd86d7e5d..2d35b3ea045135fc339166bcfaed7a960d7f0108 100644 (file)
--- a/test/syntax/vareq1.go
+++ b/test/syntax/vareq1.go
@@ -6,5 +6,5 @@
 
 package main
 
-var x map[string]string{"a":"b"}               // ERROR "var declaration missing ="
+var x map[string]string{"a":"b"}               // ERROR "unexpected { at end of statement"