Use static parsing instead of requiring a binary.

Using go/parser requires a built binary of the code to be enum'ed to
exist. This leads to two problems:
  1. The binary may be very out of date with the code, for example, when
  pulling into an existing repo that was last built locally some time
  ago, running jsonenums on newly added files will fail;
  2. If the binary has never been built, but the code already expects
  the output of jsonenums, it will be impossible to generate the enums,
  making it impossible to build the binary.

In response to a similar issue, Alan Donovan of the Go team suggested
that instead generating tools should be using (the not-yet stable)
x/tools/go/loader package to parse the actual Go code itself rather than
the compilation output: https://github.com/golang/go/issues/11415

This change uses the suggested approach to break the bootstrapping
dependency cycle.
This commit is contained in:
Benjamin Pflanz 2016-04-21 09:13:48 -04:00
parent 0c6ac79cc6
commit 7fbe89f60d
3 changed files with 26 additions and 42 deletions

View File

@ -75,7 +75,7 @@ import (
"path/filepath"
"strings"
"github.com/thought-machine/jsonenums/parser"
"github.com/adfin/jsonenums/parser"
)
var (
@ -92,14 +92,19 @@ func main() {
types := strings.Split(*typeNames, ",")
// Only one directory at a time can be processed, and the default is ".".
dir := "."
in_dir := "."
if args := flag.Args(); len(args) == 1 {
dir = args[0]
in_dir = args[0]
} else if len(args) > 1 {
log.Fatalf("only one directory at a time")
}
dir, err := filepath.Abs(in_dir)
if err != nil {
log.Fatalf("Unable to determine absolute filepath for requested path %s: %v",
in_dir, err)
}
pkg, err := parser.ParsePackage(dir, *outputPrefix, *outputSuffix+".go")
pkg, err := parser.ParsePackage(dir)
if err != nil {
log.Fatalf("parsing package: %v", err)
}

View File

@ -10,15 +10,14 @@ import (
"fmt"
"go/ast"
"go/build"
"go/parser"
"go/constant"
"go/token"
"go/types"
"log"
"path/filepath"
"strings"
"go/constant"
"go/importer"
"go/types"
"golang.org/x/tools/go/loader"
)
// A Package contains all the information related to a parsed package.
@ -30,45 +29,25 @@ type Package struct {
}
// ParsePackage parses the package in the given directory and returns it.
func ParsePackage(directory, skipPrefix, skipSuffix string) (*Package, error) {
pkgDir, err := build.Default.ImportDir(directory, 0)
func ParsePackage(directory string) (*Package, error) {
relDir, err := filepath.Rel(filepath.Join(build.Default.GOPATH, "src"), directory)
if err != nil {
return nil, fmt.Errorf("cannot process directory %s: %s", directory, err)
return nil, fmt.Errorf("provided directory not under GOPATH (%s): %v",
build.Default.GOPATH, err)
}
var files []*ast.File
fs := token.NewFileSet()
for _, name := range pkgDir.GoFiles {
if !strings.HasSuffix(name, ".go") ||
(skipSuffix != "" && strings.HasPrefix(name, skipPrefix) &&
strings.HasSuffix(name, skipSuffix)) {
continue
}
if directory != "." {
name = filepath.Join(directory, name)
}
f, err := parser.ParseFile(fs, name, nil, 0)
if err != nil {
return nil, fmt.Errorf("parsing file %v: %v", name, err)
}
files = append(files, f)
}
if len(files) == 0 {
return nil, fmt.Errorf("%s: no buildable Go files", directory)
}
// type-check the package
defs := make(map[*ast.Ident]types.Object)
config := types.Config{FakeImportC: true, Importer: importer.Default()}
info := &types.Info{Defs: defs}
if _, err := config.Check(directory, fs, files, info); err != nil {
return nil, fmt.Errorf("type-checking package: %v", err)
loaderConf := loader.Config{TypeChecker: types.Config{FakeImportC: true}}
loaderConf.Import(relDir)
program, err := loaderConf.Load()
if err != nil {
return nil, fmt.Errorf("Couldn't load package: %v", err)
}
pkgInfo := program.Package(relDir)
return &Package{
Name: files[0].Name.Name,
files: files,
defs: defs,
Name: pkgInfo.Pkg.Name(),
files: pkgInfo.Files,
defs: pkgInfo.Defs,
}, nil
}

View File

@ -21,7 +21,7 @@ import (
"go/format"
"github.com/thought-machine/jsonenums/parser"
"github.com/adfin/jsonenums/parser"
)
func init() {