Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a syntax error and add module support #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix a syntax error and add module support #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20257ab
Fix syntax error
dnephin Jun 17, 2021
391952a
Add support for go modules
dnephin Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module github.com/mdempsky/unbed

go 1.16

require golang.org/x/tools v0.1.3
27 changes: 27 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.3 h1:L69ShwSZEyCsLKoAxDKeMvLDZkumEe8gXUZAjab0tX8=
golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
75 changes: 46 additions & 29 deletions unbed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"flag"
"fmt"
"go/ast"
"go/build"
"go/format"
"go/token"
"go/types"
Expand All @@ -17,8 +16,7 @@ import (
"os"

"golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/loader"
"golang.org/x/tools/refactor/importgraph"
"golang.org/x/tools/go/packages"
)

var (
Expand All @@ -30,50 +28,68 @@ var (
field *types.Var
)


func main() {
if err := run(); err != nil {
log.Fatal(err)
}
}

func run() error {
flag.Parse()

var err error
pkgPath, typeName, fieldName, err = parseFieldSpec(flag.Arg(0))
if err != nil {
log.Fatal(err)
return fmt.Errorf("command line error: %w", err)
}

ctxt := &build.Default
conf := loader.Config{
Build: ctxt,
Fset: fset,
cfg := &packages.Config{
Mode: packages.NeedSyntax | packages.NeedTypes | packages.NeedTypesInfo | packages.NeedImports | packages.NeedDeps | packages.NeedName,
Fset: fset,
}

_, reverse, errors := importgraph.Build(ctxt)
if len(errors) != 0 {
log.Fatal(errors)
loaded, err := packages.Load(cfg, pkgPath)
switch {
case err != nil:
return fmt.Errorf("failed to load packages: %w", err)
case len(loaded) != 1:
return fmt.Errorf("expected to load 1 package, got %d", len(loaded))
}
ownerPkg := loaded[0]

for path := range reverse.Search(pkgPath) {
conf.ImportWithTests(path)
switch {
case !ownerPkg.Types.Complete():
return fmt.Errorf("incomplete scope")
case ownerPkg.IllTyped:
return fmt.Errorf("package or dependencies contain errors: %v", ownerPkg.Errors)
}

prog, err := conf.Load()
if err != nil {
log.Fatal(err)
scope := ownerPkg.Types.Scope()
tName, ok := scope.Lookup(typeName).(*types.TypeName)
if !ok {
return fmt.Errorf("failed to find type %v in %v, lookup returned %v", typeName, ownerPkg.PkgPath, tName)
}

ownerPkg := prog.Package(pkgPath).Pkg
owner = ownerPkg.Scope().Lookup(typeName).(*types.TypeName).Type().Underlying().(*types.Struct)
obj, index, _ := types.LookupFieldOrMethod(owner, false, ownerPkg, fieldName)
owner = tName.Type().Underlying().(*types.Struct)
obj, index, _ := types.LookupFieldOrMethod(owner, false, ownerPkg.Types, fieldName)
if v, ok := obj.(*types.Var); !ok || !v.IsField() || !v.Anonymous() || len(index) != 1 {
log.Fatal("expected immediate embedded field name")
return fmt.Errorf("expected immediate embedded field name")
}
field = obj.(*types.Var)

totalCount := 0
totalFiles := 0
totalPackages := 0

for _, info := range prog.InitialPackages() {
pkgs := make([]*packages.Package, 0, len(ownerPkg.Imports)+1)
pkgs = append(pkgs, ownerPkg)
for _, pkg := range ownerPkg.Imports {
pkgs = append(pkgs, pkg)
}

for _, info := range pkgs {
pkgMatch := false
for _, file := range info.Files {
for _, file := range info.Syntax {
u := unbedder{info: info}
ast.Walk(&u, file)
if len(u.res) != 0 {
Expand All @@ -90,6 +106,7 @@ func main() {
}

fmt.Fprintf(os.Stderr, "Rewrote %d selections in %d files in %d packages.\n", totalCount, totalFiles, totalPackages)
return nil
}

func edit(f *token.File, pos []token.Pos) {
Expand All @@ -107,14 +124,14 @@ func edit(f *token.File, pos []token.Pos) {
if err != nil {
log.Fatal(err)
}
err = ioutil.WriteFile(filename, buf, 0666)
err = ioutil.WriteFile(f.Name(), buf, 0666)
if err != nil {
log.Fatal(err)
}
}

type unbedder struct {
info *loader.PackageInfo
info *packages.Package
path []ast.Node
res []token.Pos
}
Expand All @@ -134,7 +151,7 @@ func (e *unbedder) Visit(n ast.Node) ast.Visitor {
}

func (e *unbedder) selector(se *ast.SelectorExpr) {
sel, ok := e.info.Selections[se]
sel, ok := e.info.TypesInfo.Selections[se]
if !ok {
// Qualified identifier.
return
Expand All @@ -145,7 +162,7 @@ func (e *unbedder) selector(se *ast.SelectorExpr) {
return
}

tv := e.info.Types[se.X]
tv := e.info.TypesInfo.Types[se.X]
typ := tv.Type
for _, fi := range idx[:len(idx)-1] {
if ptr, ok := typ.Underlying().(*types.Pointer); ok {
Expand All @@ -172,7 +189,7 @@ func (e *unbedder) selector(se *ast.SelectorExpr) {
}

// Issue #1: don't rewrite x.f to x.e.f if they don't select the same field.
if obj, _, _ := types.LookupFieldOrMethod(tv.Type, tv.Addressable(), e.info.Pkg, fieldName); obj != field {
if obj, _, _ := types.LookupFieldOrMethod(tv.Type, tv.Addressable(), e.info.Types, fieldName); obj != field {
fmt.Fprintf(os.Stderr, "%s: failed to rewrite implicit field traversal\n", fset.Position(pos))
return
}
Expand All @@ -193,6 +210,6 @@ func (e *unbedder) isUnsafeOffsetof(fun ast.Expr) bool {
return false
}

b, ok := e.info.Uses[ident].(*types.Builtin)
b, ok := e.info.TypesInfo.Uses[ident].(*types.Builtin)
return ok && b.Name() == "Offsetof"
}