[dev.typeparams] go/types: rename newTypeSet -> computeTypeSet

This is a port of CL 332089 to go/types.

Change-Id: I39321eaee184c8204bd255b7770a0770ecb25fda
Reviewed-on: https://go-review.googlesource.com/c/go/+/335036
Trust: Robert Findley <rfindley@google.com>
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>

diff --git a/src/go/types/interface.go b/src/go/types/interface.go
index fd7b55ab2f9e920382fde2afefbcc8628827c048..367fc7947750508b6604776920e97686f7888584 100644 (file)
--- a/src/go/types/interface.go
+++ b/src/go/types/interface.go
@@ -119,7 +119,7 @@ func (check *Checker) interfaceType(ityp *Interface, iface *ast.InterfaceType, d
        // Compute type set with a non-nil *Checker as soon as possible
        // to report any errors. Subsequent uses of type sets should be
        // using this computed type set and won't need to pass in a *Checker.
-       check.later(func() { newTypeSet(check, iface.Pos(), ityp) })
+       check.later(func() { computeTypeSet(check, iface.Pos(), ityp) })
 }
 
 func flattenUnion(list []ast.Expr, x ast.Expr) []ast.Expr {

diff --git a/src/go/types/type.go b/src/go/types/type.go
index 459ce9e72c1620ef409ee1097455383c156bfddb..ce857d1c80eaaa7d3fa3dc42f59edf000a09f581 100644 (file)
--- a/src/go/types/type.go
+++ b/src/go/types/type.go
@@ -268,7 +268,7 @@ type Interface struct {
 }
 
 // typeSet returns the type set for interface t.
-func (t *Interface) typeSet() *TypeSet { return newTypeSet(nil, token.NoPos, t) }
+func (t *Interface) typeSet() *TypeSet { return computeTypeSet(nil, token.NoPos, t) }
 
 // is reports whether interface t represents types that all satisfy f.
 func (t *Interface) is(f func(Type, bool) bool) bool {
@@ -634,7 +634,7 @@ func (t *TypeParam) Bound() *Interface {
                pos = n.obj.pos
        }
        // TODO(rFindley) switch this to an unexported method on Checker.
-       newTypeSet(t.check, pos, iface)
+       computeTypeSet(t.check, pos, iface)
        return iface
 }
 

diff --git a/src/go/types/typeset.go b/src/go/types/typeset.go
index b349d4922c5fb6dfdac1e911b167e412db3c8ab9..e979e90e6f5b8a33332c6c67a018a4b52678edc6 100644 (file)
--- a/src/go/types/typeset.go
+++ b/src/go/types/typeset.go
@@ -78,8 +78,8 @@ func (s *TypeSet) String() string {
 // topTypeSet may be used as type set for the empty interface.
 var topTypeSet TypeSet
 
-// newTypeSet may be called with check == nil.
-func newTypeSet(check *Checker, pos token.Pos, ityp *Interface) *TypeSet {
+// computeTypeSet may be called with check == nil.
+func computeTypeSet(check *Checker, pos token.Pos, ityp *Interface) *TypeSet {
        if ityp.tset != nil {
                return ityp.tset
        }
@@ -188,7 +188,7 @@ func newTypeSet(check *Checker, pos token.Pos, ityp *Interface) *TypeSet {
                var types Type
                switch t := under(typ).(type) {
                case *Interface:
-                       tset := newTypeSet(check, pos, t)
+                       tset := computeTypeSet(check, pos, t)
                        for _, m := range tset.methods {
                                addMethod(pos, m, false) // use embedding position pos rather than m.pos
 

diff --git a/src/go/types/typexpr.go b/src/go/types/typexpr.go
index ea39473b510be6fb6fb625535cd03192e834a4bb..342317048bd76a97cbdd4e32cc6dd2d26e4cc26d 100644 (file)
--- a/src/go/types/typexpr.go
+++ b/src/go/types/typexpr.go
@@ -140,7 +140,7 @@ func (check *Checker) ordinaryType(pos positioner, typ Type) {
        // type-checking.
        check.later(func() {
                if t := asInterface(typ); t != nil {
-                       tset := newTypeSet(check, pos.Pos(), t) // TODO(gri) is this the correct position?
+                       tset := computeTypeSet(check, pos.Pos(), t) // TODO(gri) is this the correct position?
                        if tset.types != nil {
                                check.softErrorf(pos, _Todo, "interface contains type constraints (%s)", tset.types)
                                return