languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-15 22:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

go/types, types2: factor out some code, fix/add comments (cleanups)

Browse source 
Change-Id: Id6a2e3eadc9099abbdd21b6880e1ff3ac9cfb599
Reviewed-on: https://go-review.googlesource.com/c/go/+/352312
Trust: Robert Griesemer <gri@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
This commit is contained in:
Robert Griesemer 2021-09-26 20:45:54 -07:00
parent 40fce515f9
commit d4007aedfa
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/compile/internal/types2/infer.go
View file

@ -334,7 +334,7 @@ func (w *tpWalker) isParameterized(typ Type) (res bool) {
case *TypeParam:
// t must be one of w.tparams
return t.index < len(w.tparams) && w.tparams[t.index] == t
return tparamIndex(w.tparams, t) >= 0
default:
unreachable()

6
src/cmd/compile/internal/types2/unify.go
View file

@ -108,7 +108,7 @@ func (d *tparamsList) init(tparams []*TypeParam) {
// join unifies the i'th type parameter of x with the j'th type parameter of y.
// If both type parameters already have a type associated with them and they are
// not joined, join fails and return false.
// not joined, join fails and returns false.
func (u *unifier) join(i, j int) bool {
ti := u.x.indices[i]
tj := u.y.indices[j]
@ -132,6 +132,7 @@ func (u *unifier) join(i, j int) bool {
break
case ti > 0 && tj > 0:
// Both type parameters have (possibly different) inferred types. Cannot join.
// TODO(gri) Should we check if types are identical? Investigate.
return false
case ti > 0:
// Only the type parameter for x has an inferred type. Use x slot for y.
@ -226,7 +227,7 @@ func (u *unifier) nifyEq(x, y Type, p *ifacePair) bool {
}
// nify implements the core unification algorithm which is an
// adapted version of Checker.identical0. For changes to that
// adapted version of Checker.identical. For changes to that
// code the corresponding changes should be made here.
// Must not be called directly from outside the unifier.
func (u *unifier) nify(x, y Type, p *ifacePair) bool {
@ -427,6 +428,7 @@ func (u *unifier) nify(x, y Type, p *ifacePair) bool {
}
case *Named:
// TODO(gri) This code differs now from the parallel code in Checker.identical. Investigate.
if y, ok := y.(*Named); ok {
xargs := x.targs.list()
yargs := y.targs.list()

2
src/go/types/infer.go
View file

@ -329,7 +329,7 @@ func (w *tpWalker) isParameterized(typ Type) (res bool) {
case *TypeParam:
// t must be one of w.tparams
return t.index < len(w.tparams) && w.tparams[t.index] == t
return tparamIndex(w.tparams, t) >= 0
default:
unreachable()

6
src/go/types/unify.go
View file

@ -109,7 +109,7 @@ func (d *tparamsList) init(tparams []*TypeParam) {
// join unifies the i'th type parameter of x with the j'th type parameter of y.
// If both type parameters already have a type associated with them and they are
// not joined, join fails and return false.
// not joined, join fails and returns false.
func (u *unifier) join(i, j int) bool {
ti := u.x.indices[i]
tj := u.y.indices[j]
@ -133,6 +133,7 @@ func (u *unifier) join(i, j int) bool {
break
case ti > 0 && tj > 0:
// Both type parameters have (possibly different) inferred types. Cannot join.
// TODO(gri) Should we check if types are identical? Investigate.
return false
case ti > 0:
// Only the type parameter for x has an inferred type. Use x slot for y.
@ -223,7 +224,7 @@ func (u *unifier) nifyEq(x, y Type, p *ifacePair) bool {
}
// nify implements the core unification algorithm which is an
// adapted version of Checker.identical0. For changes to that
// adapted version of Checker.identical. For changes to that
// code the corresponding changes should be made here.
// Must not be called directly from outside the unifier.
func (u *unifier) nify(x, y Type, p *ifacePair) bool {
@ -424,6 +425,7 @@ func (u *unifier) nify(x, y Type, p *ifacePair) bool {
}
case *Named:
// TODO(gri) This code differs now from the parallel code in Checker.identical. Investigate.
if y, ok := y.(*Named); ok {
xargs := x.targs.list()
yargs := y.targs.list()