From: Ian Lance Taylor <iant@golang.org>
Date: Tue, 19 May 2009 22:23:43 +0000 (-0700)
Subject: Match gccgo error messages.
X-Git-Tag: weekly.2009-11-06~1601
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=bc5620c2e084093f3b411e0b425743ca7d751a9e;p=gostls13.git

Match gccgo error messages.

bug117.go:13:12: error: reference to undefined field or method

import1.go:9:2: error: redefinition of '.main.bufio'
import1.go:8:2: note: previous definition of '.main.bufio' was here
import1.go:9:2: error: incompatible imported type 'bufio.Error'

interface9.go:25:5: error: incompatible types in assignment (method P requires a pointer)
interface9.go:30:5: error: incompatible types in assignment (method P requires a pointer)

R=rsc
DELTA=5  (0 added, 0 deleted, 5 changed)
OCL=29044
CL=29055
---

diff --git a/test/fixedbugs/bug117.go b/test/fixedbugs/bug117.go
index cc3ac34ce9..8e447cd455 100644
--- a/test/fixedbugs/bug117.go
+++ b/test/fixedbugs/bug117.go
@@ -15,7 +15,7 @@ func fn(p PS) int {
   // p has type PS, and PS has no methods.
   // (a compiler might see that p is a pointer
   // and go looking in S without noticing PS.)
-  return p.get()	// ERROR "undefined DOT"
+  return p.get()	// ERROR "undefined"
 }
 func main() {
   s := S{1};
diff --git a/test/import1.go b/test/import1.go
index caa12224c8..35b618937f 100644
--- a/test/import1.go
+++ b/test/import1.go
@@ -9,6 +9,6 @@
 package main
 
 import (
-	"bufio";
-	bufio "os";	// ERROR "redeclaration"
+	"bufio";	// GCCGO_ERROR "previous"
+	bufio "os";	// ERROR "redeclaration|redefinition|incompatible"
 )
diff --git a/test/interface9.go b/test/interface9.go
index 42214bd769..c26bdb0872 100644
--- a/test/interface9.go
+++ b/test/interface9.go
@@ -26,12 +26,12 @@ func main() {
 	var sp SP;
 
 	v = t;
-	p = t;	// ERROR "is not"
+	p = t;	// ERROR "is not|requires a pointer"
 	v = &t;
 	p = &t;
 
 	v = s;
-	p = s;	// ERROR "is not"
+	p = s;	// ERROR "is not|requires a pointer"
 	v = &s;
 	p = &s;