test: match gccgo error messages

const1.go:31:12: error: integer constant overflow
const1.go:31:12: error: integer constant overflow
const1.go:33:12: error: integer constant overflow
const1.go:33:12: error: integer constant overflow
const1.go:34:14: error: integer constant overflow
const1.go:35:17: error: integer constant overflow
const1.go:35:17: error: integer constant overflow
const1.go:35:17: error: integer constant overflow
const1.go:35:17: error: integer constant overflow
const1.go:35:17: error: integer constant overflow
const1.go:36:19: error: integer constant overflow
const1.go:37:15: error: integer constant overflow
const1.go:37:15: error: integer constant overflow
const1.go:37:24: error: integer constant overflow
const1.go:37:15: error: integer constant overflow
const1.go:37:15: error: integer constant overflow
const1.go:37:15: error: integer constant overflow
const1.go:37:24: error: integer constant overflow
const1.go:37:15: error: integer constant overflow
const1.go:38:12: error: integer constant overflow
const1.go:38:12: error: integer constant overflow
const1.go:38:12: error: integer constant overflow
const1.go:38:12: error: integer constant overflow
const1.go:41:20: error: integer constant overflow
const1.go:41:20: error: integer constant overflow
const1.go:42:20: error: integer constant overflow
const1.go:42:20: error: integer constant overflow
const1.go:44:28: error: integer constant overflow
const1.go:44:28: error: integer constant overflow
const1.go:45:14: error: integer constant overflow
const1.go:49:14: error: integer constant overflow
const1.go:50:14: error: integer constant overflow
const1.go:51:14: error: integer constant overflow
const1.go:54:23: error: integer constant overflow
const1.go:54:23: error: integer constant overflow
const1.go:54:23: error: integer constant overflow
const1.go:54:23: error: integer constant overflow
const1.go:56:14: error: integer constant overflow
const1.go:57:24: error: integer constant overflow
const1.go:57:24: error: integer constant overflow
const1.go:58:24: error: integer constant overflow
const1.go:58:24: error: integer constant overflow
const1.go:59:22: error: integer constant overflow
const1.go:59:22: error: integer constant overflow
const1.go:61:24: error: integer constant overflow
const1.go:62:20: error: division by zero
const1.go:65:19: error: floating point constant overflow
const1.go:65:19: error: floating point constant overflow
const1.go:66:28: error: floating point constant overflow
const1.go:66:28: error: floating point constant overflow
const1.go:67:19: error: floating point constant overflow
const1.go:67:19: error: floating point constant overflow
const1.go:68:19: error: division by zero
const1.go:33:14: error: integer constant overflow
const1.go:35:19: error: integer constant overflow
const1.go:42:22: error: integer constant overflow
const1.go:53:17: error: integer constant overflow
const1.go:55:14: error: integer constant overflow
const1.go:59:24: error: integer constant overflow
const1.go:69:20: error: expected integer type
const1.go:75:4: error: argument 1 has incompatible type (cannot use type int8 as type int)
const1.go:76:4: error: argument 1 has incompatible type (cannot use type int8 as type int)
const1.go:77:4: error: argument 1 has incompatible type (cannot use type uint8 as type int)
const1.go:79:4: error: argument 1 has incompatible type (cannot use type float32 as type int)
const1.go:80:4: error: argument 1 has incompatible type (cannot use type float64 as type int)
const1.go:81:4: error: floating point constant truncated to integer
const1.go:83:4: error: argument 1 has incompatible type (cannot use type float64 as type int)
const1.go:84:4: error: argument 1 has incompatible type (cannot use type string as type int)
const1.go:85:4: error: argument 1 has incompatible type (cannot use type bool as type int)
const1.go:88:7: error: const initializer cannot be nil

const2.go:14:8: error: expected ‘=’

const5.go:27:7: error: expression is not constant
const5.go:28:7: error: expression is not constant
const5.go:30:7: error: expression is not constant
const5.go:31:7: error: expression is not constant

ddd1.go:57:23: error: invalid use of ‘...’ in type conversion
ddd1.go:59:6: error: invalid use of ‘...’ in type conversion
ddd1.go:60:12: error: use of ‘[...]’ outside of array literal
ddd1.go:21:15: error: argument 1 has incompatible type
ddd1.go:22:10: error: argument 1 has incompatible type
ddd1.go:30:6: error: invalid use of ‘...’ with non-slice
ddd1.go:30:6: error: invalid use of ‘...’ with non-slice
ddd1.go:46:2: error: invalid use of %<...%> with builtin function
ddd1.go:47:2: error: invalid use of %<...%> with builtin function
ddd1.go:49:2: error: invalid use of %<...%> with builtin function
ddd1.go:50:6: error: invalid use of %<...%> with builtin function
ddd1.go:51:6: error: invalid use of %<...%> with builtin function
ddd1.go:53:6: error: invalid use of %<...%> with builtin function
ddd1.go:58:13: error: invalid use of %<...%> with builtin function
ddd1.go:20:10: error: floating point constant truncated to integer
ddd1.go:32:6: error: invalid use of ‘...’ calling non-variadic function

declbad.go:20:3: error: variables redeclared but no variable is new
declbad.go:38:3: error: variables redeclared but no variable is new
declbad.go:44:3: error: variables redeclared but no variable is new
declbad.go:51:3: error: variables redeclared but no variable is new
declbad.go:57:3: error: variables redeclared but no variable is new
declbad.go:63:3: error: variables redeclared but no variable is new
declbad.go:26:3: error: incompatible types in assignment (cannot use type float32 as type int)
declbad.go:32:3: error: incompatible types in assignment (cannot use type int as type float32)
declbad.go:44:3: error: incompatible types in assignment (different number of results)

fixedbugs/bug223.go:21:5: error: initialization expression for ‘m’ depends upon itself

fixedbugs/bug412.go:10:2: error: duplicate field name ‘x’

fixedbugs/bug413.go:11:5: error: initialization expression for ‘i’ depends upon itself

fixedbugs/bug416.go:13:1: error: method ‘X’ redeclares struct field name

fixedbugs/bug435.go:15:49: error: missing ‘)’
fixedbugs/bug435.go:15:2: error: reference to undefined name ‘bar’

fixedbugs/bug451.go:9:9: error: expected package

typeswitch3.go:39:9: error: no new variables on left side of ‘:=’
typeswitch3.go:24:2: error: impossible type switch case (type has no methods)

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

diff --git a/test/const1.go b/test/const1.go
index bc399c01c5bff243f7f819d4d5ca4f5200369e32..1580b76c68374f1582171ddc5246cf68be890953 100644 (file)
--- a/test/const1.go
+++ b/test/const1.go
@@ -66,7 +66,7 @@ var (
        c3 float64 = float64(Big) * Big // ERROR "overflow"
        c4         = Big * Big          // ERROR "overflow"
        c5         = Big / 0            // ERROR "division by zero"
-       c6         = 1000 % 1e3         // ERROR "floating-point % operation"
+       c6         = 1000 % 1e3         // ERROR "floating-point % operation|expected integer type"
 )
 
 func f(int)

diff --git a/test/const2.go b/test/const2.go
index 97d3d4c7d07f64fad2110dd9cc3021ee03ae1874..048d0cb9f397634791841763e9de764967342918 100644 (file)
--- a/test/const2.go
+++ b/test/const2.go
@@ -16,6 +16,6 @@ const (
 
 const LargeA = 1000000000000000000
 const LargeB = LargeA * LargeA * LargeA
-const LargeC = LargeB * LargeB * LargeB // ERROR "constant multiplication overflow"
+const LargeC = LargeB * LargeB * LargeB // GC_ERROR "constant multiplication overflow"
 
-const AlsoLargeA = LargeA << 400 << 400 >> 400 >> 400 // ERROR "constant shift overflow"
+const AlsoLargeA = LargeA << 400 << 400 >> 400 >> 400 // GC_ERROR "constant shift overflow"

diff --git a/test/const5.go b/test/const5.go
index 8e0385e9a563fee875a20753ceb6141a3347235e..d0eed137d1ab7567d41246b8a616f0fb9fde2fc5 100644 (file)
--- a/test/const5.go
+++ b/test/const5.go
@@ -24,10 +24,10 @@ const (
        n2 = len(m[""])
        n3 = len(s[10])
 
-       n4 = len(f())  // ERROR "must be constant"
-       n5 = len(<-c) // ERROR "must be constant"
+       n4 = len(f())  // ERROR "must be constant|is not constant"
+       n5 = len(<-c) // ERROR "must be constant|is not constant"
 
-       n6 = cap(f())  // ERROR "must be constant"
-       n7 = cap(<-c) // ERROR "must be constant"
+       n6 = cap(f())  // ERROR "must be constant|is not constant"
+       n7 = cap(<-c) // ERROR "must be constant|is not constant"
 )
 

diff --git a/test/ddd1.go b/test/ddd1.go
index 09d70c3de3cd07f7914bb4ddc0834e888b27add2..07981af126acfe3544aeb9eaa782263d9094e95d 100644 (file)
--- a/test/ddd1.go
+++ b/test/ddd1.go
@@ -27,9 +27,9 @@ func tuple() (int, int, int) { return 1, 2, 3 }
 
 var (
        _ = sum(tuple())
-       _ = sum(tuple()...) // ERROR "multiple-value"
+       _ = sum(tuple()...) // ERROR "multiple-value|[.][.][.]"
        _ = sum3(tuple())
-       _ = sum3(tuple()...) // ERROR "multiple-value" "not enough"
+       _ = sum3(tuple()...) // ERROR "multiple-value|[.][.][.]" "not enough"
 )
 
 type T []T

diff --git a/test/declbad.go b/test/declbad.go
index eace9376a3c0c798c822743c408a66389b59b71a..ff53ab0d7c5a6627d7c3d3c87c8951156cccdc93 100644 (file)
--- a/test/declbad.go
+++ b/test/declbad.go
@@ -41,8 +41,9 @@ func main() {
        {
                // multiline no new variables
                i := f1
-               i := func() int { // ERROR "redeclared|no new|incompatible"
+               i := func() { // ERROR "redeclared|no new|incompatible"
                }
+               _ = i
        }
        {
                // single redeclaration

diff --git a/test/fixedbugs/bug223.go b/test/fixedbugs/bug223.go
index eccf574a14c095e23bbd3424e623a24846f9ac18..29ae53cb713c45ab97aefb2bc029bf57a5c49589 100644 (file)
--- a/test/fixedbugs/bug223.go
+++ b/test/fixedbugs/bug223.go
@@ -18,4 +18,4 @@ func f() {
        }
 }
 
-var m = map[string]F{"f": f} // ERROR "initialization loop"
+var m = map[string]F{"f": f} // ERROR "initialization loop|depends upon itself"

diff --git a/test/fixedbugs/bug412.go b/test/fixedbugs/bug412.go
index 9148b68e7446edadfdaa7e32d67c694694f156cc..8dd0a5fcc15d7c548b7fa6a05fb98c57257bfc2c 100644 (file)
--- a/test/fixedbugs/bug412.go
+++ b/test/fixedbugs/bug412.go
@@ -7,10 +7,10 @@
 package p
 
 type t struct {
-       x int  // ERROR "duplicate field x"
+       x int  // ERROR "duplicate field x|duplicate field name .x."
        x int
 }
 
 func f(t *t) int {
-       return t.x  // ERROR "ambiguous selector t.x"
+       return t.x  // GC_ERROR "ambiguous selector t.x"
 }

diff --git a/test/fixedbugs/bug413.go b/test/fixedbugs/bug413.go
index 41270d9063a822ad323e6b0f6792dfb38df8ffc7..ba80464907be5c4e33c64203cb28519eb7d3796e 100644 (file)
--- a/test/fixedbugs/bug413.go
+++ b/test/fixedbugs/bug413.go
@@ -8,4 +8,4 @@ package p
 
 func f(i int) int { return i }
 
-var i = func() int {a := f(i); return a}()  // ERROR "initialization loop"
\ No newline at end of file
+var i = func() int {a := f(i); return a}()  // ERROR "initialization loop|depends upon itself"

diff --git a/test/fixedbugs/bug416.go b/test/fixedbugs/bug416.go
index c128538429d2c7eabfbc04b18f11e291ce659781..1d24fa935da9cd3a3336d4ace9fcd93e4e07b3f8 100644 (file)
--- a/test/fixedbugs/bug416.go
+++ b/test/fixedbugs/bug416.go
@@ -10,4 +10,4 @@ type T struct {
        X int
 }
 
-func (t *T) X() {} // ERROR "type T has both field and method named X"
+func (t *T) X() {} // ERROR "type T has both field and method named X|redeclares struct field name"

diff --git a/test/fixedbugs/bug435.go b/test/fixedbugs/bug435.go
index e6af4523885048b3b4570e7a61da8e05cf47e636..9c30b143bcf245ad725d80de30c8e655dda17c5b 100644 (file)
--- a/test/fixedbugs/bug435.go
+++ b/test/fixedbugs/bug435.go
@@ -12,4 +12,4 @@
 package main
 
 func foo() {
-       bar(1, // ERROR "unexpected"
+       bar(1, // ERROR "unexpected|missing|undefined"

diff --git a/test/fixedbugs/bug451.go b/test/fixedbugs/bug451.go
index 82182af9b9049a20871df1f31aa1f2ae9d90ba86..75ce97490ec7efaad819b08feb6b006f6360e8b7 100644 (file)
--- a/test/fixedbugs/bug451.go
+++ b/test/fixedbugs/bug451.go
@@ -6,6 +6,6 @@
 
 package main
 
-type T x.T // ERROR "undefined"
+type T x.T // ERROR "undefined|expected package"
 
 // bogus "invalid recursive type"

diff --git a/test/typeswitch3.go b/test/typeswitch3.go
index 5475a8a6d37d03646a9ab06ffc89b55f6c5a54a1..287e32e71e1786caebf57b120df9c35eff4056eb 100644 (file)
--- a/test/typeswitch3.go
+++ b/test/typeswitch3.go
@@ -36,7 +36,7 @@ func main(){
        }
        
        // Issue 2827.
-       switch _ := r.(type) {  // ERROR "invalid variable name _"
+       switch _ := r.(type) {  // ERROR "invalid variable name _|no new variables"
        }
 }