internal: replace and remove PackageInfo

The PackageInfo method was declared deprecated. This CL replaces all
usages of this method with the newer GetPackageInfo method (which is
what PackageInfo called behind the scenes), and removes the PackageInfo
function.

In addition, the code is reorganized slightly to move some vars to a
smaller scope closer to their usage.

Updates #2480.

Signed-off-by: Noam Dolovich <[email protected]>
Change-Id: Idb5a0d24d2cb5ef6d34bd17fdd5718b55c4bb465
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1194646
Reviewed-by: Daniel Martí <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>

Author: NoamTD

cmd/cue/cmd/add.go

@@ -252,7 +252,7 @@ func initFile(cmd *Command, file string, getBuild func(path string) *build.Insta
 		if err != nil {
 			return nil, err
 		}
-		if _, pkgName, _ := internal.PackageInfo(f); pkgName != "" {
+		if pkgName := internal.GetPackageInfo(f).Name; pkgName != "" {
 			if pkg := flagPackage.String(cmd); pkg != "" && pkgName != pkg {
 				return nil, fmt.Errorf("package mismatch (%s vs %s) for file %s", pkgName, pkg, file)
 			}

cmd/cue/cmd/get_go.go

@@ -591,7 +591,7 @@ func (e *extractor) importCUEFiles(p *packages.Package, dir, args string) error
 				return err
 			}
 
-			if _, pkg, _ := internal.PackageInfo(f); pkg != "" && pkg == p.Name {
+			if pkg := internal.GetPackageInfo(f).Name; pkg != "" && pkg == p.Name {
 				file := filepath.Base(path)
 				file = file[:len(file)-len(".cue")]
 				file += "_gen.cue"

cmd/cue/cmd/orphans.go

@@ -166,7 +166,6 @@ func placeOrphans(b *buildPlan, d *encoding.Decoder, pkg string, objs ...*ast.Fi
 			astutil.CopyMeta(f, file)
 		}
 		expr := internal.ToExpr(file)
-		p, _, _ := internal.PackageInfo(file)
 
 		var path cue.Path
 		var labels []ast.Label
@@ -272,7 +271,7 @@ func placeOrphans(b *buildPlan, d *encoding.Decoder, pkg string, objs ...*ast.Fi
 		} else {
 			field := &ast.Field{Label: labels[0]}
 			f.Decls = append(f.Decls, field)
-			if p != nil {
+			if p := internal.GetPackageInfo(file).Package; p != nil {
 				astutil.CopyComments(field, p)
 			}
 			for _, e := range labels[1:] {

cue/build/instance.go

@@ -239,9 +239,9 @@ func (inst *Instance) AddSyntax(file *ast.File) errors.Error {
 	astutil.Resolve(file, func(pos token.Pos, msg string, args ...interface{}) {
 		inst.Err = errors.Append(inst.Err, errors.Newf(pos, msg, args...))
 	})
-	_, pkg, pos := internal.PackageInfo(file)
+	pkg := internal.GetPackageInfo(file).Name
 	if pkg != "" && pkg != "_" && !inst.User && !inst.setPkg(pkg) && pkg != inst.PkgName {
-		err := errors.Newf(pos,
+		err := errors.Newf(file.Pos(),
 			"package name %q conflicts with previous package name %q",
 			pkg, inst.PkgName)
 		inst.ReportError(err)

cue/load/loader_common.go

@@ -212,10 +212,11 @@ func (fp *fileProcessor) add(root string, file *build.File, mode importMode) (ad
 		return true
 	}
 
-	_, pkg, pos := internal.PackageInfo(pf)
+	pkg := internal.GetPackageInfo(pf).Name
 	if pkg == "" {
 		pkg = "_"
 	}
+	pos := pf.Pos()
 
 	switch {
 	case pkg == p.PkgName, mode&allowAnonymous != 0:

internal/core/export/export.go

@@ -189,7 +189,7 @@ func (e *exporter) toFile(v *adt.Vertex, x ast.Expr) *ast.File {
 				return true
 			}
 
-			if _, name, _ := internal.PackageInfo(f); name != "" {
+			if name := internal.GetPackageInfo(f).Name; name != "" {
 				pkgName = name
 			}
 

internal/core/runtime/build.go

@@ -119,7 +119,7 @@ func (r *Runtime) CompileFile(cfg *Config, file *ast.File) (*adt.Vertex, *build.
 	if err != nil {
 		return nil, p
 	}
-	_, p.PkgName, _ = internal.PackageInfo(file)
+	p.PkgName = internal.GetPackageInfo(file).Name
 	v, _ := r.Build(cfg, p)
 	return v, p
 }

internal/internal.go

@@ -158,23 +158,13 @@ func GetPackageInfo(f *ast.File) PkgInfo {
 	return PkgInfo{}
 }
 
-// Deprecated: use GetPackageInfo
-func PackageInfo(f *ast.File) (p *ast.Package, name string, tok token.Pos) {
-	x := GetPackageInfo(f)
-	if p := x.Package; p != nil {
-		return p, x.Name, p.Name.Pos()
-	}
-	return nil, "", f.Pos()
-}
-
 func SetPackage(f *ast.File, name string, overwrite bool) {
-	p, str, _ := PackageInfo(f)
-	if p != nil {
-		if !overwrite || str == name {
+	if pi := GetPackageInfo(f); pi.Package != nil {
+		if !overwrite || pi.Name == name {
 			return
 		}
 		ident := ast.NewIdent(name)
-		astutil.CopyMeta(ident, p.Name)
+		astutil.CopyMeta(ident, pi.Package.Name)
 		return
 	}
 
@@ -235,9 +225,8 @@ func NewComment(isDoc bool, s string) *ast.CommentGroup {
 }
 
 func FileComment(f *ast.File) *ast.CommentGroup {
-	pkg, _, _ := PackageInfo(f)
 	var cgs []*ast.CommentGroup
-	if pkg != nil {
+	if pkg := GetPackageInfo(f).Package; pkg != nil {
 		cgs = pkg.Comments()
 	} else if cgs = f.Comments(); len(cgs) > 0 {
 		// Use file comment.