test: match gccgo error messages

complit1.go:37:34: error: may only omit types within composite literals of slice, array, or map type
complit1.go:38:19: error: may only omit types within composite literals of slice, array, or map type
complit1.go:18:21: error: slice of unaddressable value
complit1.go:19:10: error: slice of unaddressable value
complit1.go:20:9: error: slice of unaddressable value

convert1.go:28:13: error: invalid type conversion
convert1.go:32:12: error: invalid type conversion (cannot use type string as type Tint64)
convert1.go:36:12: error: invalid type conversion
convert1.go:37:13: error: invalid type conversion
convert1.go:40:11: error: invalid type conversion
convert1.go:41:12: error: invalid type conversion
convert1.go:44:12: error: invalid type conversion
convert1.go:46:13: error: invalid type conversion
convert1.go:48:11: error: invalid type conversion
convert1.go:50:12: error: invalid type conversion
convert1.go:52:6: error: invalid type conversion
convert1.go:53:12: error: invalid type conversion
convert1.go:54:12: error: invalid type conversion
convert1.go:56:13: error: invalid type conversion
convert1.go:57:11: error: invalid type conversion
convert1.go:58:11: error: invalid type conversion
convert1.go:64:13: error: invalid type conversion
convert1.go:68:12: error: invalid type conversion (cannot use type Tstring as type Tint64)
convert1.go:72:12: error: invalid type conversion
convert1.go:73:13: error: invalid type conversion
convert1.go:76:11: error: invalid type conversion (cannot use type Tbyte as type Trune)
convert1.go:77:12: error: invalid type conversion (cannot use type Tbyte as type Tint64)
convert1.go:80:12: error: invalid type conversion
convert1.go:82:13: error: invalid type conversion
convert1.go:84:11: error: invalid type conversion (cannot use type Trune as type Tbyte)
convert1.go:86:12: error: invalid type conversion (cannot use type Trune as type Tint64)
convert1.go:88:6: error: invalid type conversion (cannot use type Tint64 as type string)
convert1.go:89:12: error: invalid type conversion
convert1.go:90:12: error: invalid type conversion
convert1.go:92:13: error: invalid type conversion (cannot use type Tint64 as type Tstring)
convert1.go:93:11: error: invalid type conversion (cannot use type Tint64 as type Tbyte)
convert1.go:94:11: error: invalid type conversion (cannot use type Tint64 as type Trune)

fixedbugs/bug195.go:9:21: error: interface contains embedded non-interface
fixedbugs/bug195.go:12:21: error: interface contains embedded non-interface
fixedbugs/bug195.go:15:15: error: interface contains embedded non-interface
fixedbugs/bug195.go:18:2: error: invalid recursive interface
fixedbugs/bug195.go:26:2: error: invalid recursive interface
fixedbugs/bug195.go:22:2: error: invalid recursive interface

fixedbugs/bug251.go:15:2: error: invalid recursive interface
fixedbugs/bug251.go:11:2: error: invalid recursive interface

fixedbugs/bug374.go:18:34: error: use of undefined type ‘xxxx’
fixedbugs/bug374.go:16:5: error: incompatible type in initialization (incompatible type for method ‘m’ (different number of parameters))

fixedbugs/bug383.go:11:2: error: expected boolean expression
fixedbugs/bug383.go:12:2: error: expected boolean expression

fixedbugs/bug386.go:10:25: error: incompatible type for return value 1 (type has no methods)
fixedbugs/bug386.go:12:25: error: incompatible type for return value 1 (type has no methods)

fixedbugs/bug388.go:12:10: error: invalid named/anonymous mix
fixedbugs/bug388.go:17:19: error: non-name on left side of ‘:=’
fixedbugs/bug388.go:22:9: error: non-name on left side of ‘:=’
fixedbugs/bug388.go:27:10: error: expected type
fixedbugs/bug388.go:32:9: error: expected type
fixedbugs/bug388.go:23:14: error: reference to field ‘i’ in object which has no fields or methods
fixedbugs/bug388.go:18:18: error: invalid use of type

fixedbugs/bug389.go:12:5: error: incompatible type in initialization (different parameter types)

fixedbugs/bug390.go:15:24: error: expected integer, floating, or complex type

fixedbugs/bug394.go:10:1: error: expected declaration

fixedbugs/bug397.go:12:2: error: incompatible type for element 2 key in map construction

switch3.go:18:2: error: incompatible types in binary expression
switch3.go:22:2: error: incompatible types in binary expression
switch3.go:28:2: error: map can only be compared to nil
switch3.go:35:2: error: slice can only be compared to nil
switch3.go:42:2: error: func can only be compared to nil

syntax/else.go:11:9: error: expected ‘if’ or ‘{’

typeswitch2.go:15:2: error: duplicate type in switch
typeswitch2.go:19:2: error: duplicate type in switch
typeswitch2.go:26:2: error: duplicate type in switch
typeswitch2.go:40:9: error: ‘t’ declared and not used

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

test/complit1.go

@@ -34,6 +34,6 @@ type T struct {
 
 var (
 	_ = &T{0, 0, "", nil}               // ok
-	_ = &T{i: 0, f: 0, s: "", next: {}} // ERROR "missing type in composite literal"
+	_ = &T{i: 0, f: 0, s: "", next: {}} // ERROR "missing type in composite literal|omit types within composite literal"
-	_ = &T{0, 0, "", {}}                // ERROR "missing type in composite literal"
+	_ = &T{0, 0, "", {}}                // ERROR "missing type in composite literal|omit types within composite literal"
 )

test/convert1.go

@@ -25,72 +25,72 @@ func main() {
 	_ = string(s)
 	_ = []byte(s)
 	_ = []rune(s)
-	_ = []int64(s) // ERROR "cannot convert.*\[\]int64"
+	_ = []int64(s) // ERROR "cannot convert.*\[\]int64|invalid type conversion"
 	_ = Tstring(s)
 	_ = Tbyte(s)
 	_ = Trune(s)
-	_ = Tint64(s) // ERROR "cannot convert.*Tint64"
+	_ = Tint64(s) // ERROR "cannot convert.*Tint64|invalid type conversion"
 
 	_ = string(sb)
 	_ = []byte(sb)
-	_ = []rune(sb)  // ERROR "cannot convert.*\[\]rune"
+	_ = []rune(sb)  // ERROR "cannot convert.*\[\]rune|invalid type conversion"
-	_ = []int64(sb) // ERROR "cannot convert.*\[\]int64"
+	_ = []int64(sb) // ERROR "cannot convert.*\[\]int64|invalid type conversion"
 	_ = Tstring(sb)
 	_ = Tbyte(sb)
-	_ = Trune(sb)  // ERROR "cannot convert.*Trune"
+	_ = Trune(sb)  // ERROR "cannot convert.*Trune|invalid type conversion"
-	_ = Tint64(sb) // ERROR "cannot convert.*Tint64"
+	_ = Tint64(sb) // ERROR "cannot convert.*Tint64|invalid type conversion"
 
 	_ = string(sr)
-	_ = []byte(sr) // ERROR "cannot convert.*\[\]byte"
+	_ = []byte(sr) // ERROR "cannot convert.*\[\]byte|invalid type conversion"
 	_ = []rune(sr)
-	_ = []int64(sr) // ERROR "cannot convert.*\[\]int64"
+	_ = []int64(sr) // ERROR "cannot convert.*\[\]int64|invalid type conversion"
 	_ = Tstring(sr)
-	_ = Tbyte(sr) // ERROR "cannot convert.*Tbyte"
+	_ = Tbyte(sr) // ERROR "cannot convert.*Tbyte|invalid type conversion"
 	_ = Trune(sr)
-	_ = Tint64(sr) // ERROR "cannot convert.*Tint64"
+	_ = Tint64(sr) // ERROR "cannot convert.*Tint64|invalid type conversion"
 
-	_ = string(si) // ERROR "cannot convert.* string"
+	_ = string(si) // ERROR "cannot convert.* string|invalid type conversion"
-	_ = []byte(si) // ERROR "cannot convert.*\[\]byte"
+	_ = []byte(si) // ERROR "cannot convert.*\[\]byte|invalid type conversion"
-	_ = []rune(si) // ERROR "cannot convert.*\[\]rune"
+	_ = []rune(si) // ERROR "cannot convert.*\[\]rune|invalid type conversion"
 	_ = []int64(si)
-	_ = Tstring(si) // ERROR "cannot convert.*Tstring"
+	_ = Tstring(si) // ERROR "cannot convert.*Tstring|invalid type conversion"
-	_ = Tbyte(si)   // ERROR "cannot convert.*Tbyte"
+	_ = Tbyte(si)   // ERROR "cannot convert.*Tbyte|invalid type conversion"
-	_ = Trune(si)   // ERROR "cannot convert.*Trune"
+	_ = Trune(si)   // ERROR "cannot convert.*Trune|invalid type conversion"
 	_ = Tint64(si)
 
 	_ = string(ts)
 	_ = []byte(ts)
 	_ = []rune(ts)
-	_ = []int64(ts) // ERROR "cannot convert.*\[\]int64"
+	_ = []int64(ts) // ERROR "cannot convert.*\[\]int64|invalid type conversion"
 	_ = Tstring(ts)
 	_ = Tbyte(ts)
 	_ = Trune(ts)
-	_ = Tint64(ts) // ERROR "cannot convert.*Tint64"
+	_ = Tint64(ts) // ERROR "cannot convert.*Tint64|invalid type conversion"
 
 	_ = string(tsb)
 	_ = []byte(tsb)
-	_ = []rune(tsb)  // ERROR "cannot convert.*\[\]rune"
+	_ = []rune(tsb)  // ERROR "cannot convert.*\[\]rune|invalid type conversion"
-	_ = []int64(tsb) // ERROR "cannot convert.*\[\]int64"
+	_ = []int64(tsb) // ERROR "cannot convert.*\[\]int64|invalid type conversion"
 	_ = Tstring(tsb)
 	_ = Tbyte(tsb)
-	_ = Trune(tsb)  // ERROR "cannot convert.*Trune"
+	_ = Trune(tsb)  // ERROR "cannot convert.*Trune|invalid type conversion"
-	_ = Tint64(tsb) // ERROR "cannot convert.*Tint64"
+	_ = Tint64(tsb) // ERROR "cannot convert.*Tint64|invalid type conversion"
 
 	_ = string(tsr)
-	_ = []byte(tsr) // ERROR "cannot convert.*\[\]byte"
+	_ = []byte(tsr) // ERROR "cannot convert.*\[\]byte|invalid type conversion"
 	_ = []rune(tsr)
-	_ = []int64(tsr) // ERROR "cannot convert.*\[\]int64"
+	_ = []int64(tsr) // ERROR "cannot convert.*\[\]int64|invalid type conversion"
 	_ = Tstring(tsr)
-	_ = Tbyte(tsr) // ERROR "cannot convert.*Tbyte"
+	_ = Tbyte(tsr) // ERROR "cannot convert.*Tbyte|invalid type conversion"
 	_ = Trune(tsr)
-	_ = Tint64(tsr) // ERROR "cannot convert.*Tint64"
+	_ = Tint64(tsr) // ERROR "cannot convert.*Tint64|invalid type conversion"
 
-	_ = string(tsi) // ERROR "cannot convert.* string"
+	_ = string(tsi) // ERROR "cannot convert.* string|invalid type conversion"
-	_ = []byte(tsi) // ERROR "cannot convert.*\[\]byte"
+	_ = []byte(tsi) // ERROR "cannot convert.*\[\]byte|invalid type conversion"
-	_ = []rune(tsi) // ERROR "cannot convert.*\[\]rune"
+	_ = []rune(tsi) // ERROR "cannot convert.*\[\]rune|invalid type conversion"
 	_ = []int64(tsi)
-	_ = Tstring(tsi) // ERROR "cannot convert.*Tstring"
+	_ = Tstring(tsi) // ERROR "cannot convert.*Tstring|invalid type conversion"
-	_ = Tbyte(tsi)   // ERROR "cannot convert.*Tbyte"
+	_ = Tbyte(tsi)   // ERROR "cannot convert.*Tbyte|invalid type conversion"
-	_ = Trune(tsi)   // ERROR "cannot convert.*Trune"
+	_ = Trune(tsi)   // ERROR "cannot convert.*Trune|invalid type conversion"
 	_ = Tint64(tsi)
 }

test/fixedbugs/bug195.go

@@ -23,5 +23,5 @@ type I5 interface {
 }
 
 type I6 interface {
-	I5	// GC_ERROR "interface"
+	I5	// ERROR "interface"
 }

test/fixedbugs/bug251.go

@@ -12,7 +12,7 @@ type I1 interface {
 }
 
 type I2 interface {
-	I1 // GC_ERROR "loop|interface"
+	I1 // ERROR "loop|interface"
 }
 
 

test/fixedbugs/bug374.go

@@ -13,7 +13,7 @@ type I interface {
 
 type T int
 
-var _ I = T(0)
+var _ I = T(0)	// GCCGO_ERROR "incompatible"
 
 func (T) m(buf []byte) (a int, b xxxx) {  // ERROR "xxxx"
 	return 0, nil

test/fixedbugs/bug383.go

@@ -8,6 +8,6 @@
 
 package main
 func main() {
-	if 2e9 { }      // ERROR "2e.09"
+	if 2e9 { }      // ERROR "2e.09|expected bool"
-	if 3.14+1i { }  // ERROR "3.14 . 1i"
+	if 3.14+1i { }  // ERROR "3.14 . 1i|expected bool"
 }

test/fixedbugs/bug386.go

@@ -7,6 +7,6 @@
 // Issue 2451, 2452 
 package foo
 
-func f() error { return 0 } // ERROR "cannot use 0 .type int."
+func f() error { return 0 } // ERROR "cannot use 0 .type int.|has no methods"
 
-func g() error { return -1 }  // ERROR "cannot use -1 .type int."
+func g() error { return -1 }  // ERROR "cannot use -1 .type int.|has no methods"

test/fixedbugs/bug388.go

@@ -9,27 +9,27 @@
 package main
 import "runtime"
 
-func foo(runtime.UintType, i int) {  // ERROR "cannot declare name runtime.UintType"
+func foo(runtime.UintType, i int) {  // ERROR "cannot declare name runtime.UintType|named/anonymous mix"
 	println(i, runtime.UintType) 
 }
 
 func bar(i int) {
-	runtime.UintType := i       // ERROR "cannot declare name runtime.UintType"
+	runtime.UintType := i       // ERROR "cannot declare name runtime.UintType|non-name on left side"
-	println(runtime.UintType)
+	println(runtime.UintType)	// GCCGO_ERROR "invalid use of type"
 }
 
 func baz() {
-	main.i := 1	// ERROR "non-name main.i"
+	main.i := 1	// ERROR "non-name main.i|non-name on left side"
-	println(main.i)
+	println(main.i)	// GCCGO_ERROR "no fields or methods"
 }
 
 func qux() {
-	var main.i	// ERROR "unexpected [.]"
+	var main.i	// ERROR "unexpected [.]|expected type"
 	println(main.i)
 }
 
 func corge() {
-	var foo.i int  // ERROR "unexpected [.]"
+	var foo.i int  // ERROR "unexpected [.]|expected type"
 	println(foo.i)
 }
 

test/fixedbugs/bug389.go

@@ -9,4 +9,4 @@ package foo
 
 func fn(a float32) {}
 
-var f func(arg int) = fn  // ERROR "cannot use fn .type func.float32.. as type func.int. in assignment"
+var f func(arg int) = fn  // ERROR "cannot use fn .type func.float32.. as type func.int. in assignment|different parameter types"

test/fixedbugs/bug390.go

@@ -12,5 +12,5 @@ import "unsafe"
 
 func main() {
 	var x *int
-	_ = unsafe.Pointer(x) - unsafe.Pointer(x) // ERROR "operator - not defined on unsafe.Pointer"
+	_ = unsafe.Pointer(x) - unsafe.Pointer(x) // ERROR "operator - not defined on unsafe.Pointer|expected integer, floating, or complex type"
 }

test/fixedbugs/bug394.go

@@ -7,4 +7,4 @@
 // Issue 2598
 package foo
 
-return nil // ERROR "non-declaration statement outside function body"
+return nil // ERROR "non-declaration statement outside function body|expected declaration"

test/fixedbugs/bug397.go

@@ -9,5 +9,5 @@ package main
 // Issue 2623
 var m = map[string]int {
 	"abc":1,
-	1:2, // ERROR "cannot use 1.*as type string in map key"
+	1:2, // ERROR "cannot use 1.*as type string in map key|incompatible type"
 }

test/switch3.go

@@ -15,31 +15,31 @@ func bad() {
 	var s string
 
 	switch i {
-	case s: // ERROR "mismatched types string and I"
+	case s: // ERROR "mismatched types string and I|incompatible types"
 	}
 
 	switch s {
-	case i: // ERROR "mismatched types I and string"
+	case i: // ERROR "mismatched types I and string|incompatible types"
 	}
 
 	var m, m1 map[int]int
 	switch m {
 	case nil:
-	case m1: // ERROR "can only compare map m to nil"
+	case m1: // ERROR "can only compare map m to nil|map can only be compared to nil"
 	default:
 	}
 
 	var a, a1 []int
 	switch a {
 	case nil:
-	case a1: // ERROR "can only compare slice a to nil"
+	case a1: // ERROR "can only compare slice a to nil|slice can only be compared to nil"
 	default:
 	}
 
 	var f, f1 func()
 	switch f {
 	case nil:
-	case f1: // ERROR "can only compare func f to nil"
+	case f1: // ERROR "can only compare func f to nil|func can only be compared to nil"
 	default:
 	}
 }

test/syntax/else.go

@@ -8,5 +8,5 @@ package main
 
 func main() {
 	if true {
-	} else ;  // ERROR "else must be followed by if or statement block"
+	} else ;  // ERROR "else must be followed by if or statement block|expected .if. or .{."
 }

test/typeswitch2.go

@@ -23,10 +23,10 @@ func whatis(x interface{}) string {
 		w()
 	}:
 		return "rw"
-	case interface {
+	case interface {	// GCCGO_ERROR "duplicate"
 		w()
 		r()
-	}: // ERROR "duplicate"
+	}: // GC_ERROR "duplicate"
 		return "wr"
 
 	}