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 cc3ac34ce98da4d126e00adacae5fabf04458f10..8e447cd455a784614034151fc9fec75aed25c3ce 100644 (file)
--- 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 caa12224c8322cb6ffeb7c46bf20ecc822c268e8..35b618937f402cd1df2b0e63025f2fb753c162ca 100644 (file)
--- 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 42214bd7693170d7f04928d3f06c8a59c749eaed..c26bdb0872ae7128d30d16258fb4c0e53aef288c 100644 (file)
--- 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;