go/types, types2: remove local version processing in favor of go/version

[gostls13.git] / src / cmd / compile / internal / types2 / errors.go

diff --git a/src/cmd/compile/internal/types2/errors.go b/src/cmd/compile/internal/types2/errors.go
index 0906a1b45c2dfb0b9a8d3f907c7b2f16912be882..b8414b48498f242b088f5f8d1517156de31db1e4 100644 (file)
--- a/src/cmd/compile/internal/types2/errors.go
+++ b/src/cmd/compile/internal/types2/errors.go
@@ -10,6 +10,7 @@ import (
        "bytes"
        "cmd/compile/internal/syntax"
        "fmt"
+       . "internal/types/errors"
        "runtime"
        "strconv"
        "strings"
@@ -35,7 +36,7 @@ func unreachable() {
 // To report an error_, call Checker.report.
 type error_ struct {
        desc []errorDesc
-       code errorCode
+       code Code
        soft bool // TODO(gri) eventually determine this from an error code
 }
 
@@ -86,7 +87,7 @@ func (err *error_) String() string {
 // errorf adds formatted error information to err.
 // It may be called multiple times to provide additional information.
 func (err *error_) errorf(at poser, format string, args ...interface{}) {
-       err.desc = append(err.desc, errorDesc{posFor(at), format, args})
+       err.desc = append(err.desc, errorDesc{atPos(at), format, args})
 }
 
 func sprintf(qf Qualifier, tpSubscripts bool, format string, args ...interface{}) string {
@@ -219,7 +220,14 @@ func (check *Checker) dump(format string, args ...interface{}) {
        fmt.Println(sprintf(check.qualifier, true, format, args...))
 }
 
-func (check *Checker) err(at poser, code errorCode, msg string, soft bool) {
+func (check *Checker) err(at poser, code Code, msg string, soft bool) {
+       switch code {
+       case InvalidSyntaxTree:
+               msg = "invalid syntax tree: " + msg
+       case 0:
+               panic("no error code provided")
+       }
+
        // Cheap trick: Don't report errors with messages containing
        // "invalid operand" or "invalid type" as those tend to be
        // follow-on errors which don't add useful information. Only
@@ -229,7 +237,7 @@ func (check *Checker) err(at poser, code errorCode, msg string, soft bool) {
                return
        }
 
-       pos := posFor(at)
+       pos := atPos(at)
 
        // If we are encountering an error while evaluating an inherited
        // constant initialization expression, pos is the position of in
@@ -242,7 +250,17 @@ func (check *Checker) err(at poser, code errorCode, msg string, soft bool) {
                pos = check.errpos
        }
 
-       err := Error{pos, stripAnnotations(msg), msg, soft}
+       // If we have a URL for error codes, add a link to the first line.
+       if code != 0 && check.conf.ErrorURL != "" {
+               u := fmt.Sprintf(check.conf.ErrorURL, code)
+               if i := strings.Index(msg, "\n"); i >= 0 {
+                       msg = msg[:i] + u + msg[i:]
+               } else {
+                       msg += u
+               }
+       }
+
+       err := Error{pos, stripAnnotations(msg), msg, soft, code}
        if check.firstErr == nil {
                check.firstErr = err
        }
@@ -259,7 +277,6 @@ func (check *Checker) err(at poser, code errorCode, msg string, soft bool) {
 }
 
 const (
-       invalidAST = "invalid AST: "
        invalidArg = "invalid argument: "
        invalidOp  = "invalid operation: "
 )
@@ -268,26 +285,26 @@ type poser interface {
        Pos() syntax.Pos
 }
 
-func (check *Checker) error(at poser, code errorCode, msg string) {
+func (check *Checker) error(at poser, code Code, msg string) {
        check.err(at, code, msg, false)
 }
 
-func (check *Checker) errorf(at poser, code errorCode, format string, args ...interface{}) {
+func (check *Checker) errorf(at poser, code Code, format string, args ...interface{}) {
        check.err(at, code, check.sprintf(format, args...), false)
 }
 
-func (check *Checker) softErrorf(at poser, code errorCode, format string, args ...interface{}) {
+func (check *Checker) softErrorf(at poser, code Code, format string, args ...interface{}) {
        check.err(at, code, check.sprintf(format, args...), true)
 }
 
-func (check *Checker) versionErrorf(at poser, goVersion string, format string, args ...interface{}) {
+func (check *Checker) versionErrorf(at poser, v goVersion, format string, args ...interface{}) {
        msg := check.sprintf(format, args...)
-       msg = fmt.Sprintf("%s requires %s or later", msg, goVersion)
-       check.err(at, _UnsupportedFeature, msg, true)
+       msg = fmt.Sprintf("%s requires %s or later", msg, v)
+       check.err(at, UnsupportedFeature, msg, true)
 }
 
-// posFor reports the left (= start) position of at.
-func posFor(at poser) syntax.Pos {
+// atPos reports the left (= start) position of at.
+func atPos(at poser) syntax.Pos {
        switch x := at.(type) {
        case *operand:
                if x.expr != nil {