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

[gostls13.git] / src / go / types / errors.go

diff --git a/src/go/types/errors.go b/src/go/types/errors.go
index 28ee276272da423c9f63ee86f844ff1a374828e5..63b0d9db8f22f4c591d3d349a603d57aa8c1085d 100644 (file)
--- a/src/go/types/errors.go
+++ b/src/go/types/errors.go
@@ -11,6 +11,7 @@ import (
        "fmt"
        "go/ast"
        "go/token"
+       . "internal/types/errors"
        "runtime"
        "strconv"
        "strings"
@@ -36,7 +37,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
 }
 
@@ -53,7 +54,7 @@ func (err *error_) empty() bool {
 
 func (err *error_) pos() token.Pos {
        if err.empty() {
-               return token.NoPos
+               return nopos
        }
        return err.desc[0].posn.Pos()
 }
@@ -219,11 +220,29 @@ func (check *Checker) report(errp *error_) {
                panic("empty error details")
        }
 
+       msg := errp.msg(check.fset, check.qualifier)
+       switch errp.code {
+       case InvalidSyntaxTree:
+               msg = "invalid AST: " + msg
+       case 0:
+               panic("no error code provided")
+       }
+
+       // If we have a URL for error codes, add a link to the first line.
+       if errp.code != 0 && check.conf._ErrorURL != "" {
+               u := fmt.Sprintf(check.conf._ErrorURL, errp.code)
+               if i := strings.Index(msg, "\n"); i >= 0 {
+                       msg = msg[:i] + u + msg[i:]
+               } else {
+                       msg += u
+               }
+       }
+
        span := spanOf(errp.desc[0].posn)
        e := Error{
                Fset:       check.fset,
                Pos:        span.pos,
-               Msg:        errp.msg(check.fset, check.qualifier),
+               Msg:        msg,
                Soft:       errp.soft,
                go116code:  errp.code,
                go116start: span.start,
@@ -257,7 +276,7 @@ func (check *Checker) report(errp *error_) {
                check.firstErr = err
        }
 
-       if trace {
+       if check.conf._Trace {
                pos := e.Pos
                msg := e.Msg
                check.trace(pos, "ERROR: %s", msg)
@@ -270,47 +289,40 @@ func (check *Checker) report(errp *error_) {
        f(err)
 }
 
+const (
+       invalidArg = "invalid argument: "
+       invalidOp  = "invalid operation: "
+)
+
 // newErrorf creates a new error_ for later reporting with check.report.
-func newErrorf(at positioner, code errorCode, format string, args ...any) *error_ {
+func newErrorf(at positioner, code Code, format string, args ...any) *error_ {
        return &error_{
                desc: []errorDesc{{at, format, args}},
                code: code,
        }
 }
 
-func (check *Checker) error(at positioner, code errorCode, msg string) {
-       check.report(newErrorf(at, code, msg))
+func (check *Checker) error(at positioner, code Code, msg string) {
+       check.report(newErrorf(at, code, "%s", msg))
 }
 
-func (check *Checker) errorf(at positioner, code errorCode, format string, args ...any) {
+func (check *Checker) errorf(at positioner, code Code, format string, args ...any) {
        check.report(newErrorf(at, code, format, args...))
 }
 
-func (check *Checker) softErrorf(at positioner, code errorCode, format string, args ...any) {
+func (check *Checker) softErrorf(at positioner, code Code, format string, args ...any) {
        err := newErrorf(at, code, format, args...)
        err.soft = true
        check.report(err)
 }
 
-func (check *Checker) versionErrorf(at positioner, goVersion string, format string, args ...interface{}) {
+func (check *Checker) versionErrorf(at positioner, v goVersion, format string, args ...interface{}) {
        msg := check.sprintf(format, args...)
        var err *error_
-       err = newErrorf(at, _UnsupportedFeature, "%s requires %s or later", msg, goVersion)
+       err = newErrorf(at, UnsupportedFeature, "%s requires %s or later", msg, v)
        check.report(err)
 }
 
-func (check *Checker) invalidAST(at positioner, format string, args ...any) {
-       check.errorf(at, 0, "invalid AST: "+format, args...)
-}
-
-func (check *Checker) invalidArg(at positioner, code errorCode, format string, args ...any) {
-       check.errorf(at, code, "invalid argument: "+format, args...)
-}
-
-func (check *Checker) invalidOp(at positioner, code errorCode, format string, args ...any) {
-       check.errorf(at, code, "invalid operation: "+format, args...)
-}
-
 // The positioner interface is used to extract the position of type-checker
 // errors.
 type positioner interface {
@@ -365,7 +377,7 @@ func spanOf(at positioner) posSpan {
                        pos := x.Pos()
                        return posSpan{pos, pos, x.expr.End()}
                }
-               return posSpan{token.NoPos, token.NoPos, token.NoPos}
+               return posSpan{nopos, nopos, nopos}
        default:
                pos := at.Pos()
                return posSpan{pos, pos, pos}