qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 16:50:13 -07:00
Code Releases Activity

go/types, types: add additional generic cases for the Selections API

Browse Source 
Change-Id: Icc5240db7447846061d0d81f5e15f788758d4d64
Reviewed-on: https://go-review.googlesource.com/c/go/+/393372
Trust: Robert Findley <rfindley@google.com>
Reviewed-by: Robert Griesemer <gri@golang.org>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
Robert Findley 2022-03-08 16:16:49 -05:00
parent a8f019e956
commit 2da1e47fb0
2 changed files with 76 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/cmd/compile/internal/types2/api_test.go
View File

@ -1428,15 +1428,23 @@ type C struct {
c int c int
} }
type G[P any] struct {
p P
}
func (G[P]) m(P) {}
var Inst G[int]
func (C) g() func (C) g()
func (*C) h() func (*C) h()
func main() { func main() {
// qualified identifiers // qualified identifiers
var _ lib.T var _ lib.T
_ = lib.C _ = lib.C
_ = lib.F _ = lib.F
_ = lib.V _ = lib.V
_ = lib.T.M _ = lib.T.M
// fields // fields
@ -1452,25 +1460,30 @@ func main() {
_ = A{}.c _ = A{}.c
_ = new(A).c _ = new(A).c
_ = Inst.p
_ = G[string]{}.p
// methods // methods
_ = A{}.f _ = A{}.f
_ = new(A).f _ = new(A).f
_ = A{}.g _ = A{}.g
_ = new(A).g _ = new(A).g
_ = new(A).h _ = new(A).h
_ = B{}.f _ = B{}.f
_ = new(B).f _ = new(B).f
_ = C{}.g _ = C{}.g
_ = new(C).g _ = new(C).g
_ = new(C).h _ = new(C).h
_ = Inst.m
// method expressions // method expressions
_ = A.f _ = A.f
_ = (*A).f _ = (*A).f
_ = B.f _ = B.f
_ = (*B).f _ = (*B).f
_ = G[string].m
}` }`
wantOut := map[string][2]string{ wantOut := map[string][2]string{
@ -1484,6 +1497,7 @@ func main() {
"new(A).b": {"field (*main.A) b int", "->[0 0]"}, "new(A).b": {"field (*main.A) b int", "->[0 0]"},
"A{}.c": {"field (main.A) c int", ".[1 0]"}, "A{}.c": {"field (main.A) c int", ".[1 0]"},
"new(A).c": {"field (*main.A) c int", "->[1 0]"}, "new(A).c": {"field (*main.A) c int", "->[1 0]"},
"Inst.p": {"field (main.G[int]) p int", ".[0]"},
"A{}.f": {"method (main.A) f(int)", "->[0 0]"}, "A{}.f": {"method (main.A) f(int)", "->[0 0]"},
"new(A).f": {"method (*main.A) f(int)", "->[0 0]"}, "new(A).f": {"method (*main.A) f(int)", "->[0 0]"},
@ -1495,11 +1509,14 @@ func main() {
"C{}.g": {"method (main.C) g()", ".[0]"}, "C{}.g": {"method (main.C) g()", ".[0]"},
"new(C).g": {"method (*main.C) g()", "->[0]"}, "new(C).g": {"method (*main.C) g()", "->[0]"},
"new(C).h": {"method (*main.C) h()", "->[1]"}, // TODO(gri) should this report .[1] ? "new(C).h": {"method (*main.C) h()", "->[1]"}, // TODO(gri) should this report .[1] ?
"Inst.m": {"method (main.G[int]) m(int)", ".[0]"},
"A.f": {"method expr (main.A) f(main.A, int)", "->[0 0]"}, "A.f": {"method expr (main.A) f(main.A, int)", "->[0 0]"},
"(*A).f": {"method expr (*main.A) f(*main.A, int)", "->[0 0]"}, "(*A).f": {"method expr (*main.A) f(*main.A, int)", "->[0 0]"},
"B.f": {"method expr (main.B) f(main.B, int)", ".[0]"}, "B.f": {"method expr (main.B) f(main.B, int)", ".[0]"},
"(*B).f": {"method expr (*main.B) f(*main.B, int)", "->[0]"}, "(*B).f": {"method expr (*main.B) f(*main.B, int)", "->[0]"},
"G[string].m": {"method expr (main.G[string]) m(main.G[string], string)", ".[0]"},
"G[string]{}.p": {"field (main.G[string]) p string", ".[0]"},
} }
makePkg("lib", libSrc) makePkg("lib", libSrc)

59
src/go/types/api_test.go
View File

@ -1432,15 +1432,23 @@ type C struct {
c int c int
} }
type G[P any] struct {
p P
}
func (G[P]) m(P) {}
var Inst G[int]
func (C) g() func (C) g()
func (*C) h() func (*C) h()
func main() { func main() {
// qualified identifiers // qualified identifiers
var _ lib.T var _ lib.T
_ = lib.C _ = lib.C
_ = lib.F _ = lib.F
_ = lib.V _ = lib.V
_ = lib.T.M _ = lib.T.M
// fields // fields
@ -1456,25 +1464,30 @@ func main() {
_ = A{}.c _ = A{}.c
_ = new(A).c _ = new(A).c
_ = Inst.p
_ = G[string]{}.p
// methods // methods
_ = A{}.f _ = A{}.f
_ = new(A).f _ = new(A).f
_ = A{}.g _ = A{}.g
_ = new(A).g _ = new(A).g
_ = new(A).h _ = new(A).h
_ = B{}.f _ = B{}.f
_ = new(B).f _ = new(B).f
_ = C{}.g _ = C{}.g
_ = new(C).g _ = new(C).g
_ = new(C).h _ = new(C).h
_ = Inst.m
// method expressions // method expressions
_ = A.f _ = A.f
_ = (*A).f _ = (*A).f
_ = B.f _ = B.f
_ = (*B).f _ = (*B).f
_ = G[string].m
}` }`
wantOut := map[string][2]string{ wantOut := map[string][2]string{
@ -1488,6 +1501,7 @@ func main() {
"new(A).b": {"field (*main.A) b int", "->[0 0]"}, "new(A).b": {"field (*main.A) b int", "->[0 0]"},
"A{}.c": {"field (main.A) c int", ".[1 0]"}, "A{}.c": {"field (main.A) c int", ".[1 0]"},
"new(A).c": {"field (*main.A) c int", "->[1 0]"}, "new(A).c": {"field (*main.A) c int", "->[1 0]"},
"Inst.p": {"field (main.G[int]) p int", ".[0]"},
"A{}.f": {"method (main.A) f(int)", "->[0 0]"}, "A{}.f": {"method (main.A) f(int)", "->[0 0]"},
"new(A).f": {"method (*main.A) f(int)", "->[0 0]"}, "new(A).f": {"method (*main.A) f(int)", "->[0 0]"},
@ -1499,11 +1513,14 @@ func main() {
"C{}.g": {"method (main.C) g()", ".[0]"}, "C{}.g": {"method (main.C) g()", ".[0]"},
"new(C).g": {"method (*main.C) g()", "->[0]"}, "new(C).g": {"method (*main.C) g()", "->[0]"},
"new(C).h": {"method (*main.C) h()", "->[1]"}, // TODO(gri) should this report .[1] ? "new(C).h": {"method (*main.C) h()", "->[1]"}, // TODO(gri) should this report .[1] ?
"Inst.m": {"method (main.G[int]) m(int)", ".[0]"},
"A.f": {"method expr (main.A) f(main.A, int)", "->[0 0]"}, "A.f": {"method expr (main.A) f(main.A, int)", "->[0 0]"},
"(*A).f": {"method expr (*main.A) f(*main.A, int)", "->[0 0]"}, "(*A).f": {"method expr (*main.A) f(*main.A, int)", "->[0 0]"},
"B.f": {"method expr (main.B) f(main.B, int)", ".[0]"}, "B.f": {"method expr (main.B) f(main.B, int)", ".[0]"},
"(*B).f": {"method expr (*main.B) f(*main.B, int)", "->[0]"}, "(*B).f": {"method expr (*main.B) f(*main.B, int)", "->[0]"},
"G[string].m": {"method expr (main.G[string]) m(main.G[string], string)", ".[0]"},
"G[string]{}.p": {"field (main.G[string]) p string", ".[0]"},
} }
makePkg("lib", libSrc) makePkg("lib", libSrc)