Match gccgo error messages.

bug121.go:12:3: error: name list not allowed in interface type
bug121.go:16:2: error: expected signature or type name

semi1.go:10:76: error: unexpected semicolon or newline before ‘{’
semi1.go:10:5: error: reference to undefined name ‘x’
semi1.go:10:8: error: reference to undefined name ‘y’
semi1.go:12:3: error: reference to undefined name ‘z’

semi2.go:10:79: error: unexpected semicolon or newline before ‘{’
semi2.go:10:9: error: reference to undefined name ‘x’

semi3.go:10:79: error: unexpected semicolon or newline before ‘{’
semi3.go:10:6: error: reference to undefined name ‘x’
semi3.go:10:9: error: reference to undefined name ‘y’
semi3.go:10:12: error: reference to undefined name ‘z’
semi3.go:12:3: error: reference to undefined name ‘z’

semi4.go:11:2: error: unexpected semicolon or newline before ‘{’
semi4.go:10:6: error: reference to undefined name ‘x’
semi4.go:12:3: error: reference to undefined name ‘z’

semi5.go:10:1: error: unexpected semicolon or newline before ‘{’

semi7.go:11:2: error: unexpected semicolon or newline before ‘else’
semi7.go:10:5: error: reference to undefined name ‘x’

slice.go:9:11: error: missing lower bound in slice expression
slice.go:9:9: error: reference to undefined name ‘y’
slice.go:9:12: error: reference to undefined name ‘z’

R=rsc
CC=golang-dev
https://golang.org/cl/201061

diff --git a/test/fixedbugs/bug121.go b/test/fixedbugs/bug121.go
index 71d3ee4252e6852b37daaf2c12a92886ecedb324..15c8451da93963d788ffc19dcc03915f0072caa8 100644 (file)
--- a/test/fixedbugs/bug121.go
+++ b/test/fixedbugs/bug121.go
@@ -9,7 +9,7 @@ package main
 type T func()
 
 type I interface {
-       f, g ();        // ERROR "syntax|signature"
+       f, g ();        // ERROR "name list not allowed"
 }
 
 type J interface {

diff --git a/test/syntax/semi1.go b/test/syntax/semi1.go
index 5ec776bba6bdeaa29de6db8057fdbb88a25905c3..547d9bf79957a3a6e390a68b9f31d06306c827c1 100644 (file)
--- a/test/syntax/semi1.go
+++ b/test/syntax/semi1.go
@@ -7,8 +7,8 @@
 package main
 
 func main() {
-       if x; y // ERROR "unexpected semicolon or newline before {"
+       if x; y         // ERROR "unexpected semicolon or newline before .?{.?|undefined"
        {
-               z
+               z       // GCCGO_ERROR "undefined"
 
 

diff --git a/test/syntax/semi2.go b/test/syntax/semi2.go
index 14800a33e7ef8cb8c65d681ae4626c8c72ebb73c..28d1d3906ddd6ceacf8586b0f362b87162ca8f88 100644 (file)
--- a/test/syntax/semi2.go
+++ b/test/syntax/semi2.go
@@ -7,7 +7,7 @@
 package main
 
 func main() {
-       switch x; y     // ERROR "unexpected semicolon or newline before {"
+       switch x; y     // ERROR "unexpected semicolon or newline before .?{.?|undefined"
        {
                z
 

diff --git a/test/syntax/semi3.go b/test/syntax/semi3.go
index d8e037fdc015833404280796017c8860762c9f8e..ab5941bda5b71c817d86b72f653a166e8c05a8fd 100644 (file)
--- a/test/syntax/semi3.go
+++ b/test/syntax/semi3.go
@@ -7,8 +7,8 @@
 package main
 
 func main() {
-       for x; y; z     // ERROR "unexpected semicolon or newline before {"
+       for x; y; z     // ERROR "unexpected semicolon or newline before .?{.?|undefined"
        {
-               z
+               z       // GCCGO_ERROR "undefined"
 
 

diff --git a/test/syntax/semi4.go b/test/syntax/semi4.go
index 81134c19b4e2e90ea3d206c47bc5c0ccdd978bb0..7a9c2956e72882f6f9f029fad274f7c463e14a0b 100644 (file)
--- a/test/syntax/semi4.go
+++ b/test/syntax/semi4.go
@@ -7,8 +7,8 @@
 package main
 
 func main() {
-       for x
-       {       // ERROR "unexpected semicolon or newline before {"
-               z
+       for x           // GCCGO_ERROR "undefined"
+       {               // ERROR "unexpected semicolon or newline before .?{.?"
+               z       // GCCGO_ERROR "undefined"
 
 

diff --git a/test/syntax/semi5.go b/test/syntax/semi5.go
index 0ba4df8d6dec132e3f94fc5c223483d8a6e4cfe6..5f8ccc688f79bf26f72b0463b8b21f90ddfa2fa5 100644 (file)
--- a/test/syntax/semi5.go
+++ b/test/syntax/semi5.go
@@ -7,7 +7,7 @@
 package main
 
 func main()
-{      // ERROR "unexpected semicolon or newline before {"
+{      // ERROR "unexpected semicolon or newline before .?{.?"
 
 
 

diff --git a/test/syntax/semi7.go b/test/syntax/semi7.go
index a4271ddc5c086d19b25bf2ee2939098e5ab566d3..5a7b3ff4cc8ec2c71b4253ce28c15eaaf91f1236 100644 (file)
--- a/test/syntax/semi7.go
+++ b/test/syntax/semi7.go
@@ -7,8 +7,8 @@
 package main
 
 func main() {
-       if x { }
-       else { }        // ERROR "unexpected semicolon or newline before else"
+       if x { }        // GCCGO_ERROR "undefined"
+       else { }        // ERROR "unexpected semicolon or newline before .?else.?"
 }
 
 

diff --git a/test/syntax/slice.go b/test/syntax/slice.go
index 4bc5d4d8d2aecddb3fbc3e58464fcb8a22b68e26..7675ca18798d4f1f21f0ad058ca212801bd56e7d 100644 (file)
--- a/test/syntax/slice.go
+++ b/test/syntax/slice.go
@@ -6,4 +6,4 @@
 
 package main
 
-var x = y[:z]  // ERROR "missing lower bound in slice expression"
+var x = y[:z]  // ERROR "missing lower bound in slice expression|undefined"