go/types: export Info.FileVersions

[gostls13.git] / src / go / types / check.go

diff --git a/src/go/types/check.go b/src/go/types/check.go
index 6301323c2a8bdb320f3269a8b80b8ebe18d5e4d4..89b8ee07a25d9f71049a7be0281a3cdce61e56c7 100644 (file)
--- a/src/go/types/check.go
+++ b/src/go/types/check.go
@@ -90,7 +90,7 @@ type actionDesc struct {
 }
 
 // A Checker maintains the state of the type checker.
-// It must be created with NewChecker.
+// It must be created with [NewChecker].
 type Checker struct {
        // package information
        // (initialized by NewChecker, valid for the life-time of checker)
@@ -99,12 +99,12 @@ type Checker struct {
        fset *token.FileSet
        pkg  *Package
        *Info
-       version version                 // accepted language version
-       posVers map[*token.File]version // maps files to versions (may be nil)
-       nextID  uint64                  // unique Id for type parameters (first valid Id is 1)
-       objMap  map[Object]*declInfo    // maps package-level objects and (non-interface) methods to declaration info
-       impMap  map[importKey]*Package  // maps (import path, source directory) to (complete or fake) package
-       valids  instanceLookup          // valid *Named (incl. instantiated) types per the validType check
+       version version                // accepted language version
+       posVers map[token.Pos]version  // maps file start positions to versions (may be nil)
+       nextID  uint64                 // unique Id for type parameters (first valid Id is 1)
+       objMap  map[Object]*declInfo   // maps package-level objects and (non-interface) methods to declaration info
+       impMap  map[importKey]*Package // maps (import path, source directory) to (complete or fake) package
+       valids  instanceLookup         // valid *Named (incl. instantiated) types per the validType check
 
        // pkgPathMap maps package names to the set of distinct import paths we've
        // seen for that name, anywhere in the import graph. It is used for
@@ -172,7 +172,7 @@ func (check *Checker) validAlias(alias *TypeName, typ Type) {
 
 // isBrokenAlias reports whether alias doesn't have a determined type yet.
 func (check *Checker) isBrokenAlias(alias *TypeName) bool {
-       return alias.typ == Typ[Invalid] && check.brokenAliases[alias]
+       return !isValid(alias.typ) && check.brokenAliases[alias]
 }
 
 func (check *Checker) rememberUntyped(e ast.Expr, lhs bool, mode operandMode, typ *Basic, val constant.Value) {
@@ -221,8 +221,8 @@ func (check *Checker) needsCleanup(c cleaner) {
        check.cleaners = append(check.cleaners, c)
 }
 
-// NewChecker returns a new Checker instance for a given package.
-// Package files may be added incrementally via checker.Files.
+// NewChecker returns a new [Checker] instance for a given package.
+// [Package] files may be added incrementally via checker.Files.
 func NewChecker(conf *Config, fset *token.FileSet, pkg *Package, info *Info) *Checker {
        // make sure we have a configuration
        if conf == nil {
@@ -287,9 +287,10 @@ func (check *Checker) initFiles(files []*ast.File) {
                }
        }
 
+       // collect file versions
        for _, file := range check.files {
-               v, _ := parseGoVersion(file.GoVersion)
-               if v.major > 0 {
+               check.recordFileVersion(file, check.conf.GoVersion)
+               if v, _ := parseGoVersion(file.GoVersion); v.major > 0 {
                        if v.equal(check.version) {
                                continue
                        }
@@ -310,19 +311,14 @@ func (check *Checker) initFiles(files []*ast.File) {
                                continue
                        }
                        if check.posVers == nil {
-                               check.posVers = make(map[*token.File]version)
+                               check.posVers = make(map[token.Pos]version)
                        }
-                       check.posVers[check.fset.File(file.FileStart)] = v
+                       check.posVers[file.FileStart] = v
+                       check.recordFileVersion(file, file.GoVersion) // overwrite package version
                }
        }
 }
 
-// A posVers records that the file starting at pos declares the Go version vers.
-type posVers struct {
-       pos  token.Pos
-       vers version
-}
-
 // A bailout panic is used for early termination.
 type bailout struct{}
 
@@ -509,7 +505,7 @@ func (check *Checker) recordTypeAndValue(x ast.Expr, mode operandMode, typ Type,
                assert(val != nil)
                // We check allBasic(typ, IsConstType) here as constant expressions may be
                // recorded as type parameters.
-               assert(typ == Typ[Invalid] || allBasic(typ, IsConstType))
+               assert(!isValid(typ) || allBasic(typ, IsConstType))
        }
        if m := check.Types; m != nil {
                m[x] = TypeAndValue{mode, typ, val}
@@ -636,3 +632,9 @@ func (check *Checker) recordScope(node ast.Node, scope *Scope) {
                m[node] = scope
        }
 }
+
+func (check *Checker) recordFileVersion(file *ast.File, version string) {
+       if m := check.FileVersions; m != nil {
+               m[file] = version
+       }
+}