libgo: Update to weekly.2011-11-02.

[pf3gnuchains/gcc-fork.git] / libgo / go / runtime / error.go

diff --git a/libgo/go/runtime/error.go b/libgo/go/runtime/error.go
index 2b5517f..c5168a7 100644 (file)
--- a/libgo/go/runtime/error.go
+++ b/libgo/go/runtime/error.go
@@ -6,11 +6,11 @@ package runtime
 
 // The Error interface identifies a run time error.
 type Error interface {
-       String() string
+       error
 
        // RuntimeError is a no-op function but
        // serves to distinguish types that are runtime
-       // errors from ordinary os.Errors: a type is a
+       // errors from ordinary errors: a type is a
        // runtime error if it has a RuntimeError method.
        RuntimeError()
 }
@@ -28,7 +28,7 @@ type TypeAssertionError struct {
 
 func (*TypeAssertionError) RuntimeError() {}
 
-func (e *TypeAssertionError) String() string {
+func (e *TypeAssertionError) Error() string {
        inter := e.interfaceString
        if inter == "" {
                inter = "interface"
@@ -98,7 +98,7 @@ type errorString string
 
 func (e errorString) RuntimeError() {}
 
-func (e errorString) String() string {
+func (e errorString) Error() string {
        return "runtime error: " + string(e)
 }
 
@@ -123,6 +123,8 @@ func Printany(i interface{}) {
                print("nil")
        case stringer:
                print(v.String())
+       case error:
+               print(v.Error())
        case int:
                print(v)
        case string: