close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd/guru: allow foo/... and -foo patterns in scope argument 

Also, document -scope argument.

Depends on CL 19746 (buildutil.ExpandPatterns)

Change-Id: I3c9000e94d87cca5c2c49fe8de12a77fc43f7257
Reviewed-on: https://go-review.googlesource.com/19747
Reviewed-by: Daniel Morsing <daniel.morsing@gmail.com>
Reviewed-by: Michael Matloob <matloob@golang.org>
This commit is contained in:
Alan Donovan 2016-02-20 19:34:40 -05:00
parent a69e659f44
commit 3f95c66345
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/guru/guru.go
View File

@ -22,6 +22,7 @@ import (
"golang.org/x/tools/cmd/guru/serial" "golang.org/x/tools/cmd/guru/serial"
"golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/buildutil"
"golang.org/x/tools/go/loader" "golang.org/x/tools/go/loader"
"golang.org/x/tools/go/pointer" "golang.org/x/tools/go/pointer"
"golang.org/x/tools/go/ssa" "golang.org/x/tools/go/ssa"
@ -129,18 +130,13 @@ func Run(q *Query) error {
} }
func setPTAScope(lconf *loader.Config, scope []string) error { func setPTAScope(lconf *loader.Config, scope []string) error {
if len(scope) == 0 { pkgs := buildutil.ExpandPatterns(lconf.Build, scope)
if len(pkgs) == 0 {
return fmt.Errorf("no packages specified for pointer analysis scope") return fmt.Errorf("no packages specified for pointer analysis scope")
} }
// The value of each entry in pkgs is true,
// Determine initial packages for PTA. // giving ImportWithTests (not Import) semantics.
args, err := lconf.FromArgs(scope, true) lconf.ImportPkgs = pkgs
if err != nil {
return err
}
if len(args) > 0 {
return fmt.Errorf("surplus arguments: %q", args)
}
return nil return nil
} }

12
cmd/guru/main.go
View File

@ -34,7 +34,7 @@ import (
// flags // flags
var ( var (
modifiedFlag = flag.Bool("modified", false, "read archive of modified files from standard input") modifiedFlag = flag.Bool("modified", false, "read archive of modified files from standard input")
scopeFlag = flag.String("scope", "", "comma-separated list of `packages` the analysis should be limited to (default=all)") scopeFlag = flag.String("scope", "", "comma-separated list of `packages` the analysis should be limited to")
ptalogFlag = flag.String("ptalog", "", "write points-to analysis log to `file`") ptalogFlag = flag.String("ptalog", "", "write points-to analysis log to `file`")
formatFlag = flag.String("format", "plain", "output `format`; one of {plain,json,xml}") formatFlag = flag.String("format", "plain", "output `format`; one of {plain,json,xml}")
reflectFlag = flag.Bool("reflect", false, "analyze reflection soundly (slow)") reflectFlag = flag.Bool("reflect", false, "analyze reflection soundly (slow)")
@ -78,13 +78,21 @@ The -format flag controls the output format:
xml structured data in XML syntax. xml structured data in XML syntax.
The -modified flag causes guru to read an archive from standard input. The -modified flag causes guru to read an archive from standard input.
Files in this archive will be used in preference to those in Files in this archive will be used in preference to those in
the file system. In this way, a text editor may supply guru the file system. In this way, a text editor may supply guru
with the contents of its unsaved buffers. Each archive entry with the contents of its unsaved buffers. Each archive entry
consists of the file name, a newline, the decimal file size, consists of the file name, a newline, the decimal file size,
another newline, and the contents of the file. another newline, and the contents of the file.
The -scope flag restricts analysis to the specified packages.
Its value is a comma-separated list of patterns of these forms:
golang.org/x/tools/cmd/guru # a single package
golang.org/x/tools/... # all packages beneath dir
... # the entire workspace.
A pattern preceded by '-' is negative, so the scope
encoding/...,-encoding/xml
matches all encoding packages except encoding/xml:
User manual: http://golang.org/s/oracle-user-manual User manual: http://golang.org/s/oracle-user-manual
Example: describe syntax at offset 530 in this file (an import spec): Example: describe syntax at offset 530 in this file (an import spec):