internal: phase out PkgInfo.IsAnonymous

Its logic can be very easily replicated with ast.File.PackageName, which already treats "_" as equal to a missing package name. Signed-off-by: Daniel Martí <[email protected]> Change-Id: If8e19bbb6d28d0cd91bfd157d53e49cd736c31e2 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1200970 TryBot-Result: CUEcueckoo <[email protected]> Reviewed-by: Roger Peppe <[email protected]> Unity-Result: CUE porcuepine <[email protected]>
cue-lang · Sep 12, 2024 · 44b4ab5 · 44b4ab5
1 parent d34eb57
commit 44b4ab5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/internal/core/compile/compile.go b/internal/core/compile/compile.go
@@ -275,7 +275,7 @@ func (c *compiler) compileFiles(a []*ast.File) *adt.Vertex { // Or value?
 	// - anything in an anonymous file
 	//
 	for _, f := range a {
-		if p := internal.GetPackageInfo(f); p.IsAnonymous() {
+		if f.PackageName() == "" {
 			continue
 		}
 		for _, d := range f.Decls {

diff --git a/internal/core/runtime/resolve.go b/internal/core/runtime/resolve.go
@@ -21,7 +21,6 @@ import (
 	"cuelang.org/go/cue/ast"
 	"cuelang.org/go/cue/build"
 	"cuelang.org/go/cue/errors"
-	"cuelang.org/go/internal"
 )
 
 // TODO(resolve): this is also done in compile, do we need both?
@@ -32,7 +31,7 @@ func (r *Runtime) ResolveFiles(p *build.Instance) (errs errors.Error) {
 	// may be linked to any top-level entry of any of the files.
 	allFields := map[string]ast.Node{}
 	for _, f := range p.Files {
-		if p := internal.GetPackageInfo(f); p.IsAnonymous() {
+		if f.PackageName() == "" {
 			continue
 		}
 		for _, d := range f.Decls {
@@ -44,7 +43,7 @@ func (r *Runtime) ResolveFiles(p *build.Instance) (errs errors.Error) {
 		}
 	}
 	for _, f := range p.Files {
-		if p := internal.GetPackageInfo(f); p.IsAnonymous() {
+		if f.PackageName() == "" {
 			continue
 		}
 		err := resolveFile(idx, f, p, allFields)

diff --git a/internal/internal.go b/internal/internal.go
@@ -138,11 +138,6 @@ type PkgInfo struct {
 	Name    string
 }
 
-// IsAnonymous reports whether the package is anonymous.
-func (p *PkgInfo) IsAnonymous() bool {
-	return p.Name == "" || p.Name == "_"
-}
-
 func GetPackageInfo(f *ast.File) PkgInfo {
 	for i, d := range f.Decls {
 		switch x := d.(type) {