diff --git a/cmd/root.go b/cmd/root.go index b8a0c56..96cf1e5 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -35,9 +35,9 @@ var pkg string var ignoredPkgs []string type filename string -type typename string +type specname string -func inspect(node ast.Node, fname filename, typesUsed map[filename][]typename, declaredAt map[typename]filename) { +func inspect(node ast.Node, fname filename, typesUsed map[filename][]specname, declaredAt map[specname]filename) { switch v := node.(type) { case *ast.File: for _, decl := range v.Decls { @@ -49,15 +49,15 @@ func inspect(node ast.Node, fname filename, typesUsed map[filename][]typename, d } case *ast.TypeSpec: inspect(v.Type, fname, typesUsed, declaredAt) - name := typename(v.Name.Name) + name := specname(v.Name.Name) declaredAt[name] = fname case *ast.ValueSpec: inspect(v.Type, fname, typesUsed, declaredAt) for _, name := range v.Names { - declaredAt[typename(name.Name)] = fname + declaredAt[specname(name.Name)] = fname } case *ast.Ident: - typesUsed[fname] = append(typesUsed[fname], typename(v.Name)) + typesUsed[fname] = append(typesUsed[fname], specname(v.Name)) case *ast.ParenExpr: inspect(v.X, fname, typesUsed, declaredAt) case *ast.SelectorExpr: @@ -92,7 +92,7 @@ func inspect(node ast.Node, fname filename, typesUsed map[filename][]typename, d } } -func constructDependencyGraph(typesUsed map[filename][]typename, declaredAt map[typename]filename, ignores map[typename]bool) (*depgraph.DependencyGraph, error) { +func constructDependencyGraph(typesUsed map[filename][]specname, declaredAt map[specname]filename, ignores map[specname]bool) (*depgraph.DependencyGraph, error) { depGraph := depgraph.NewDependencyGraph() for fname, types := range typesUsed { from := depgraph.NewSourcefile(string(fname)) @@ -134,17 +134,17 @@ func parse(cmd *cobra.Command, args []string) { log.Fatal(err) } - typesUsed := make(map[filename][]typename) - declaredAt := make(map[typename]filename) + typesUsed := make(map[filename][]specname) + declaredAt := make(map[specname]filename) tree := pkgs["models"] for fpath, file := range tree.Files { fname := filename(filepath.Base(fpath)) - typesUsed[fname] = make([]typename, 0) + typesUsed[fname] = make([]specname, 0) inspect(file, fname, typesUsed, declaredAt) } - ignores := map[typename]bool{ + ignores := map[specname]bool{ "any": true, "bool": true, "byte": true, @@ -170,7 +170,7 @@ func parse(cmd *cobra.Command, args []string) { } for _, ignoredPkg := range ignoredPkgs { - ignores[typename(ignoredPkg)] = true + ignores[specname(ignoredPkg)] = true } depGraph, err := constructDependencyGraph(typesUsed, declaredAt, ignores)