qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 04:07:59 -07:00
Code Releases Activity

[dev.typeparams] cmd/compile/internal/types2: rename newTypeSet -> computeTypeSet

Browse Source 
Follow-up on comment in https://golang.org/cl/329309.

Change-Id: I31f746180237b916c1825fa1688641849478ba41
Reviewed-on: https://go-review.googlesource.com/c/go/+/332089
Trust: Robert Griesemer <gri@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
This commit is contained in:
Robert Griesemer 2021-06-30 12:45:51 -07:00
parent 1eb756689c
commit fac21803ce
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/compile/internal/types2/interface.go
View File

@ -114,7 +114,7 @@ func (check *Checker) interfaceType(ityp *Interface, iface *syntax.InterfaceType
// 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 []syntax.Expr, x syntax.Expr) []syntax.Expr {

4
src/cmd/compile/internal/types2/type.go
View File

@ -274,7 +274,7 @@ type Interface struct {
}
// typeSet returns the type set for interface t.
func (t *Interface) typeSet() *TypeSet { return newTypeSet(nil, nopos, t) }
func (t *Interface) typeSet() *TypeSet { return computeTypeSet(nil, nopos, t) }
// is reports whether interface t represents types that all satisfy f.
func (t *Interface) is(f func(Type, bool) bool) bool {
@ -637,7 +637,7 @@ func (t *TypeParam) Bound() *Interface {
pos = n.obj.pos
}
// TODO(gri) switch this to an unexported method on Checker.
newTypeSet(t.check, pos, iface)
computeTypeSet(t.check, pos, iface)
return iface
}

6
src/cmd/compile/internal/types2/typeset.go
View File

@ -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 syntax.Pos, ityp *Interface) *TypeSet {
// computeTypeSet may be called with check == nil.
func computeTypeSet(check *Checker, pos syntax.Pos, ityp *Interface) *TypeSet {
if ityp.tset != nil {
return ityp.tset
}
@ -188,7 +188,7 @@ func newTypeSet(check *Checker, pos syntax.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
}

2
src/cmd/compile/internal/types2/typexpr.go
View File

@ -141,7 +141,7 @@ func (check *Checker) ordinaryType(pos syntax.Pos, typ Type) {
// interface methods. Delay this check to the end of type-checking.
check.later(func() {
if t := asInterface(typ); t != nil {
tset := newTypeSet(check, pos, t) // TODO(gri) is this the correct position?
tset := computeTypeSet(check, pos, t) // TODO(gri) is this the correct position?
if tset.types != nil {
check.softErrorf(pos, "interface contains type constraints (%s)", tset.types)
return