From: Ian Lance Taylor <iant@golang.org>
Date: Tue, 18 Aug 2009 00:40:52 +0000 (-0700)
Subject: Match gccgo error messages.
X-Git-Tag: weekly.2009-11-06~850
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f7e4fc9b1fde08034741505c006f2fcf46e9d725;p=gostls13.git

Match gccgo error messages.

bug165.go:13:6: error: invalid recursive type 'S'

This is a different line from the 6g error message, which is
"invalid map key type".  I accomodated both compilers by
merging the line.

bug188.go:13:2: error: unexpected reference to package

I made the error message less specific, which I think is fine
here.

R=rsc
DELTA=2  (0 added, 0 deleted, 2 changed)
OCL=33398
CL=33426
---

diff --git a/test/fixedbugs/bug165.go b/test/fixedbugs/bug165.go
index a4fe715c2c..8ce67a46db 100644
--- a/test/fixedbugs/bug165.go
+++ b/test/fixedbugs/bug165.go
@@ -11,5 +11,5 @@ type I interface {
 }
 
 type S struct {
-	m map[S] bool;	// ERROR "map key type|complete"
+	m map[S] bool;	// ERROR "map key type"
 }
diff --git a/test/fixedbugs/bug188.go b/test/fixedbugs/bug188.go
index cbd421bb79..3851cb672c 100644
--- a/test/fixedbugs/bug188.go
+++ b/test/fixedbugs/bug188.go
@@ -10,5 +10,5 @@ import "sort"
 
 func main() {
 	var x int;
-	sort(x);	// ERROR "package.*selector"
+	sort(x);	// ERROR "package"
 }