From 7da4675dadbdb079df486de44365e5685dfd99b7 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Thu, 12 Jan 2023 11:14:32 -0800 Subject: go/types, types2: use factored parse/typecheck functions, generate hilbert_test.go Change-Id: I4a325736d18a98bbcd02bfa3d32b1d1dd2048dc2 Reviewed-on: https://go-review.googlesource.com/c/go/+/461609 Auto-Submit: Robert Griesemer TryBot-Result: Gopher Robot Reviewed-by: Robert Findley Reviewed-by: Robert Griesemer Run-TryBot: Robert Griesemer --- src/cmd/compile/internal/types2/builtins_test.go | 8 +------- src/cmd/compile/internal/types2/hilbert_test.go | 17 +---------------- src/cmd/compile/internal/types2/mono_test.go | 6 +----- 3 files changed, 3 insertions(+), 28 deletions(-) (limited to 'src/cmd') diff --git a/src/cmd/compile/internal/types2/builtins_test.go b/src/cmd/compile/internal/types2/builtins_test.go index 12c139f492..0d4f57e277 100644 --- a/src/cmd/compile/internal/types2/builtins_test.go +++ b/src/cmd/compile/internal/types2/builtins_test.go @@ -7,7 +7,6 @@ package types2_test import ( "cmd/compile/internal/syntax" "fmt" - "strings" "testing" . "cmd/compile/internal/types2" @@ -172,14 +171,9 @@ func TestBuiltinSignatures(t *testing.T) { } } -func parseGenericSrc(path, src string) (*syntax.File, error) { - errh := func(error) {} // dummy error handler so that parsing continues in presence of errors - return syntax.Parse(syntax.NewFileBase(path), strings.NewReader(src), errh, nil, 0) -} - func testBuiltinSignature(t *testing.T, name, src0, want string) { src := fmt.Sprintf(`package p; import "unsafe"; type _ unsafe.Pointer /* use unsafe */; func _[P ~[]byte]() { %s }`, src0) - f, err := parseGenericSrc("", src) + f, err := parse("", src) if err != nil { t.Errorf("%s: %s", src0, err) return diff --git a/src/cmd/compile/internal/types2/hilbert_test.go b/src/cmd/compile/internal/types2/hilbert_test.go index 391a498268..0e9d4c3f5b 100644 --- a/src/cmd/compile/internal/types2/hilbert_test.go +++ b/src/cmd/compile/internal/types2/hilbert_test.go @@ -10,9 +10,6 @@ import ( "fmt" "os" "testing" - - "cmd/compile/internal/syntax" - . "cmd/compile/internal/types2" ) var ( @@ -28,19 +25,7 @@ func TestHilbert(t *testing.T) { return } - // parse source - f, err := syntax.Parse(syntax.NewFileBase("hilbert.go"), bytes.NewReader(src), nil, nil, 0) - if err != nil { - t.Fatal(err) - } - - // type-check file - DefPredeclaredTestFuncs() // define assert built-in - conf := Config{Importer: defaultImporter()} - _, err = conf.Check(f.PkgName.Value, []*syntax.File{f}, nil) - if err != nil { - t.Fatal(err) - } + mustTypecheck("hilbert.go", string(src), nil) } func program(n int, out string) []byte { diff --git a/src/cmd/compile/internal/types2/mono_test.go b/src/cmd/compile/internal/types2/mono_test.go index 890099207c..506762abae 100644 --- a/src/cmd/compile/internal/types2/mono_test.go +++ b/src/cmd/compile/internal/types2/mono_test.go @@ -15,11 +15,7 @@ import ( func checkMono(t *testing.T, body string) error { src := "package x; import `unsafe`; var _ unsafe.Pointer;\n" + body - file, err := syntax.Parse(syntax.NewFileBase("x.go"), strings.NewReader(src), nil, nil, 0) - if err != nil { - t.Fatal(err) - } - files := []*syntax.File{file} + files := []*syntax.File{mustParse("x.go", src)} var buf strings.Builder conf := types2.Config{ -- cgit v1.3