PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*: Update import name to github.com/go-delve/delve

Browse Source 
The repository is being switched from the personal account
github.com/derekparker/delve to the organization account
github.com/go-delve/delve. This patch updates imports and docs, while
preserving things which should not be changed such as my name in the
CHANGELOG and in TODO comments.
This commit is contained in:
Derek Parker 2019-01-04 10:39:25 -08:00 committed by Alessandro Arzilli
parent 385c7935a6
commit 4c9a72e486
91 changed files with 258 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/KnownBugs.md
View File

@ -1,6 +1,6 @@
# Known Bugs # Known Bugs
- When a function defines two (or more) variables with the same name delve is unable to distinguish between them: `locals` will print both variables, `print` will randomly pick one. See [Issue #106](https://github.com/derekparker/delve/issues/106). - When a function defines two (or more) variables with the same name delve is unable to distinguish between them: `locals` will print both variables, `print` will randomly pick one. See [Issue #106](https://github.com/go-delve/delve/issues/106).
- Delve does not currently support 32bit systems. This will usually manifest as a compiler error in `proc/disasm.go`. See [Issue #20](https://github.com/derekparker/delve/issues/20). - Delve does not currently support 32bit systems. This will usually manifest as a compiler error in `proc/disasm.go`. See [Issue #20](https://github.com/go-delve/delve/issues/20).
- When Delve is compiled with versions of go prior to 1.7.0 it is not possible to set a breakpoint on a function in a remote package using the `Receiver.MethodName` syntax. See [Issue #528](https://github.com/derekparker/delve/issues/528). - When Delve is compiled with versions of go prior to 1.7.0 it is not possible to set a breakpoint on a function in a remote package using the `Receiver.MethodName` syntax. See [Issue #528](https://github.com/go-delve/delve/issues/528).
- When running Delve on binaries compiled with a version of go prior to 1.9.0 `locals` will print all local variables, including ones that are out of scope. If there are multiple variables defined with the same name in the current function `print` will not be able to select the correct one for the current line. - When running Delve on binaries compiled with a version of go prior to 1.9.0 `locals` will print all local variables, including ones that are out of scope. If there are multiple variables defined with the same name in the current function `print` will not be able to select the correct one for the current line.

10
Documentation/api/ClientHowto.md
View File

@ -27,7 +27,7 @@ Command line arguments that should be handed to the inferior process should be s
dlv exec --headless ./somebinary -- these arguments are for the inferior process dlv exec --headless ./somebinary -- these arguments are for the inferior process
``` ```
Specifying a static port number, like in the [README](//github.com/derekparker/Delve/tree/master/Documentation/README.md) example, can be done using `--listen=127.0.0.1:portnumber`. Specifying a static port number, like in the [README](//github.com/go-delve/Delve/tree/master/Documentation/README.md) example, can be done using `--listen=127.0.0.1:portnumber`.
This will, however, cause problems if you actually spawn multiple instances of the debugger. This will, however, cause problems if you actually spawn multiple instances of the debugger.
@ -37,11 +37,11 @@ It's probably better to let Delve pick a random unused port number on its own. T
Once you have a running headless instance you can connect to it and start sending commands. Delve's protocol is built on top of the [JSON-RPC](http://json-rpc.org) specification. Once you have a running headless instance you can connect to it and start sending commands. Delve's protocol is built on top of the [JSON-RPC](http://json-rpc.org) specification.
The methods of a `service/rpc2.RPCServer` are exposed through this connection, to find out which requests you can send see the documentation of RPCServer on [godoc](https://godoc.org/github.com/derekparker/Delve/service/rpc2#RPCServer). The methods of a `service/rpc2.RPCServer` are exposed through this connection, to find out which requests you can send see the documentation of RPCServer on [godoc](https://godoc.org/github.com/go-delve/Delve/service/rpc2#RPCServer).
### Example ### Example
Let's say you are trying to create a breakpoint. By looking at [godoc](https://godoc.org/github.com/derekparker/Delve/service/rpc2#RPCServer) you'll find that there is a `CreateBreakpoint` method in `RPCServer`. Let's say you are trying to create a breakpoint. By looking at [godoc](https://godoc.org/github.com/go-delve/Delve/service/rpc2#RPCServer) you'll find that there is a `CreateBreakpoint` method in `RPCServer`.
This method, like all other methods of RPCServer that you can call through the API, has two arguments: `args` and `out`: `args` contains all the input arguments of `CreateBreakpoint`, while `out` is what `CreateBreakpoint` will return to you. This method, like all other methods of RPCServer that you can call through the API, has two arguments: `args` and `out`: `args` contains all the input arguments of `CreateBreakpoint`, while `out` is what `CreateBreakpoint` will return to you.
@ -178,7 +178,7 @@ from a list of all functions you should specify the name of the function in
the FunctionName field of Breakpoint and set Line to -1. *Do not omit Line, the FunctionName field of Breakpoint and set Line to -1. *Do not omit Line,
do not set Line to 0*. do not set Line to 0*.
If you want to support the [same language as dlv's break and trace commands](//github.com/derekparker/Delve/tree/master/Documentation/cli/locspec.md) If you want to support the [same language as dlv's break and trace commands](//github.com/go-delve/Delve/tree/master/Documentation/cli/locspec.md)
you should call RPCServer.FindLocation and you should call RPCServer.FindLocation and
then use the returned slice of Location objects to create Breakpoints to then use the returned slice of Location objects to create Breakpoints to
pass to CreateBreakpoint: just fill each Breakpoint.Addr with the pass to CreateBreakpoint: just fill each Breakpoint.Addr with the
@ -232,7 +232,7 @@ are interested in the topmost stack frame of the current goroutine (or
thread) use: `EvalScope{ GoroutineID: -1, Frame: 0 }`. thread) use: `EvalScope{ GoroutineID: -1, Frame: 0 }`.
More information on the expression language interpreted by RPCServer.Eval More information on the expression language interpreted by RPCServer.Eval
can be found [here](//github.com/derekparker/Delve/tree/master/Documentation/cli/expr.md). can be found [here](//github.com/go-delve/Delve/tree/master/Documentation/cli/expr.md).
### Variable shadowing ### Variable shadowing

2
Documentation/api/json-rpc/README.md
View File

@ -12,7 +12,7 @@ Delve currently supports two versions of its API. By default a headless instance
# API version 2 documentation # API version 2 documentation
All the methods of the type `service/rpc2.RPCServer` can be called using JSON-RPC, the documentation for these calls is [available on godoc](https://godoc.org/github.com/derekparker/delve/service/rpc2#RPCServer). All the methods of the type `service/rpc2.RPCServer` can be called using JSON-RPC, the documentation for these calls is [available on godoc](https://godoc.org/github.com/go-delve/delve/service/rpc2#RPCServer).
Note that all exposed methods take one single input parameter (usually called `args`) of a struct type and also return a result of a struct type. Also note that the method name should be prefixed with `RPCServer.` in JSON-RPC. Note that all exposed methods take one single input parameter (usually called `args`) of a struct type and also return a result of a struct type. Also note that the method name should be prefixed with `RPCServer.` in JSON-RPC.

8
Documentation/cli/README.md
View File

@ -60,7 +60,7 @@ Sets a breakpoint.
break [name] <linespec> break [name] <linespec>
See [Documentation/cli/locspec.md](//github.com/derekparker/delve/tree/master/Documentation/cli/locspec.md) for the syntax of linespec. See [Documentation/cli/locspec.md](//github.com/go-delve/delve/tree/master/Documentation/cli/locspec.md) for the syntax of linespec.
See also: "help on", "help cond" and "help clear" See also: "help on", "help cond" and "help clear"
@ -303,7 +303,7 @@ Evaluate an expression.
[goroutine <n>] [frame <m>] print <expression> [goroutine <n>] [frame <m>] print <expression>
See [Documentation/cli/expr.md](//github.com/derekparker/delve/tree/master/Documentation/cli/expr.md) for a description of supported expressions. See [Documentation/cli/expr.md](//github.com/go-delve/delve/tree/master/Documentation/cli/expr.md) for a description of supported expressions.
Aliases: p Aliases: p
@ -332,7 +332,7 @@ Changes the value of a variable.
[goroutine <n>] [frame <m>] set <variable> = <value> [goroutine <n>] [frame <m>] set <variable> = <value>
See [Documentation/cli/expr.md](//github.com/derekparker/delve/tree/master/Documentation/cli/expr.md) for a description of supported expressions. Only numerical variables and pointers can be changed. See [Documentation/cli/expr.md](//github.com/go-delve/delve/tree/master/Documentation/cli/expr.md) for a description of supported expressions. Only numerical variables and pointers can be changed.
## source ## source
@ -391,7 +391,7 @@ Set tracepoint.
trace [name] <linespec> trace [name] <linespec>
A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See [Documentation/cli/locspec.md](//github.com/derekparker/delve/tree/master/Documentation/cli/locspec.md) for the syntax of linespec. A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See [Documentation/cli/locspec.md](//github.com/go-delve/delve/tree/master/Documentation/cli/locspec.md) for the syntax of linespec.
See also: "help on", "help cond" and "help clear" See also: "help on", "help cond" and "help clear"

6
Documentation/installation/linux/install.md
View File

@ -5,14 +5,14 @@ Please use the following steps to build and install Delve on Linux.
There are two ways to install on Linux. First is the standard `go get` method: There are two ways to install on Linux. First is the standard `go get` method:
``` ```
go get -u github.com/derekparker/delve/cmd/dlv go get -u github.com/go-delve/delve/cmd/dlv
``` ```
Alternatively make sure $GOPATH is set (e.g. as `~/.go`) and: Alternatively make sure $GOPATH is set (e.g. as `~/.go`) and:
``` ```
$ git clone https://github.com/derekparker/delve.git $GOPATH/src/github.com/derekparker/delve $ git clone https://github.com/go-delve/delve.git $GOPATH/src/github.com/go-delve/delve
$ cd $GOPATH/src/github.com/derekparker/delve $ cd $GOPATH/src/github.com/go-delve/delve
$ make install $ make install
``` ```

6
Documentation/installation/osx/install.md
View File

@ -9,10 +9,10 @@ This should be as simple as:
Now you can install delve using `go get`: Now you can install delve using `go get`:
``` ```
$ go get -u github.com/derekparker/delve/cmd/dlv $ go get -u github.com/go-delve/delve/cmd/dlv
``` ```
With this method you will not be able to use delve's native backend, *but you don't need it anyway*: the native backend on macOS [has known problems](https://github.com/derekparker/delve/issues/1112) on recent issues of the OS and is not currently maintained. With this method you will not be able to use delve's native backend, *but you don't need it anyway*: the native backend on macOS [has known problems](https://github.com/go-delve/delve/issues/1112) on recent issues of the OS and is not currently maintained.
## Compiling the native backend ## Compiling the native backend
@ -20,7 +20,7 @@ Only do this if you have a valid reason to use the native backend.
1. Run `xcode-select --install` 1. Run `xcode-select --install`
2. On macOS 10.14 manually install the legacy include headers by running `/Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg` 2. On macOS 10.14 manually install the legacy include headers by running `/Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg`
3. Clone the repo into `$GOPATH/src/github.com/derekparker/delve` 3. Clone the repo into `$GOPATH/src/github.com/go-delve/delve`
4. Run `make install` in that directory (on some versions of macOS this requires being root, the first time you run it, to install a new certificate) 4. Run `make install` in that directory (on some versions of macOS this requires being root, the first time you run it, to install a new certificate)
The makefile will take care of creating and installing a self-signed certificate automatically. The makefile will take care of creating and installing a self-signed certificate automatically.

2
Documentation/installation/windows/install.md
View File

@ -3,7 +3,7 @@
Please use the standard `go get` command to build and install Delve on Windows. Please use the standard `go get` command to build and install Delve on Windows.
``` ```
go get -u github.com/derekparker/delve/cmd/dlv go get -u github.com/go-delve/delve/cmd/dlv
``` ```
Also, if not already set, you have to add the %GOPATH%\bin directory to your PATH variable. Also, if not already set, you have to add the %GOPATH%\bin directory to your PATH variable.

12
README.md
View File

@ -1,10 +1,10 @@
![Delve](https://raw.githubusercontent.com/derekparker/delve/master/assets/delve_horizontal.png) ![Delve](https://raw.githubusercontent.com/go-delve/delve/master/assets/delve_horizontal.png)
[![license](http://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/derekparker/delve/master/LICENSE) [![license](http://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/go-delve/delve/master/LICENSE)
[![GoDoc](https://godoc.org/github.com/derekparker/delve?status.svg)](https://godoc.org/github.com/derekparker/delve) [![GoDoc](https://godoc.org/github.com/go-delve/delve?status.svg)](https://godoc.org/github.com/go-delve/delve)
[![Build Status](https://travis-ci.org/derekparker/delve.svg?branch=master)](https://travis-ci.org/derekparker/delve) [![Build Status](https://travis-ci.org/go-delve/delve.svg?branch=master)](https://travis-ci.org/go-delve/delve)
[![Build status](https://ci.appveyor.com/api/projects/status/9e9edx1qlp3145j5/branch/master?svg=true)](https://ci.appveyor.com/project/derekparker/delve) [![Build status](https://ci.appveyor.com/api/projects/status/9e9edx1qlp3145j5/branch/master?svg=true)](https://ci.appveyor.com/project/go-delve/delve)
[![Join the chat at https://gitter.im/derekparker/delve](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/derekparker/delve?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Join the chat at https://gitter.im/go-delve/delve](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-delve/delve?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
The Github issue tracker is for **bugs** only. Please use the [developer mailing list](https://groups.google.com/forum/#!forum/delve-dev) for any feature proposals and discussions. The Github issue tracker is for **bugs** only. Please use the [developer mailing list](https://groups.google.com/forum/#!forum/delve-dev) for any feature proposals and discussions.

2
_fixtures/consts.go
View File

@ -2,7 +2,7 @@ package main
import ( import (
"fmt" "fmt"
"github.com/derekparker/delve/_fixtures/internal/dir0/pkg" "github.com/go-delve/delve/_fixtures/internal/dir0/pkg"
"runtime" "runtime"
) )

4
_fixtures/dotpackagesiface.go
View File

@ -2,8 +2,8 @@ package main
import ( import (
"fmt" "fmt"
"github.com/derekparker/delve/_fixtures/internal/dir.io" "github.com/go-delve/delve/_fixtures/internal/dir.io"
"github.com/derekparker/delve/_fixtures/internal/dir.io/io.io" "github.com/go-delve/delve/_fixtures/internal/dir.io/io.io"
"runtime" "runtime"
) )

6
_fixtures/pkgrenames.go
View File

@ -8,9 +8,9 @@ import (
pkg1 "go/ast" pkg1 "go/ast"
pkg2 "net/http" pkg2 "net/http"
"github.com/derekparker/delve/_fixtures/internal/dir0/pkg" "github.com/go-delve/delve/_fixtures/internal/dir0/pkg"
"github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage" "github.com/go-delve/delve/_fixtures/internal/dir0/renamedpackage"
dir1pkg "github.com/derekparker/delve/_fixtures/internal/dir1/pkg" dir1pkg "github.com/go-delve/delve/_fixtures/internal/dir1/pkg"
) )
func main() { func main() {

18
cmd/dlv/cmds/commands.go
View File

@ -12,15 +12,15 @@ import (
"strconv" "strconv"
"syscall" "syscall"
"github.com/derekparker/delve/pkg/config" "github.com/go-delve/delve/pkg/config"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
"github.com/derekparker/delve/pkg/logflags" "github.com/go-delve/delve/pkg/logflags"
"github.com/derekparker/delve/pkg/terminal" "github.com/go-delve/delve/pkg/terminal"
"github.com/derekparker/delve/pkg/version" "github.com/go-delve/delve/pkg/version"
"github.com/derekparker/delve/service" "github.com/go-delve/delve/service"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
"github.com/derekparker/delve/service/rpc2" "github.com/go-delve/delve/service/rpc2"
"github.com/derekparker/delve/service/rpccommon" "github.com/go-delve/delve/service/rpccommon"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

16
cmd/dlv/dlv_test.go
View File

@ -14,10 +14,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/derekparker/delve/cmd/dlv/cmds" "github.com/go-delve/delve/cmd/dlv/cmds"
protest "github.com/derekparker/delve/pkg/proc/test" protest "github.com/go-delve/delve/pkg/proc/test"
"github.com/derekparker/delve/pkg/terminal" "github.com/go-delve/delve/pkg/terminal"
"github.com/derekparker/delve/service/rpc2" "github.com/go-delve/delve/service/rpc2"
"github.com/spf13/cobra/doc" "github.com/spf13/cobra/doc"
) )
@ -56,7 +56,7 @@ func projectRoot() string {
for _, curpath := range gopaths { for _, curpath := range gopaths {
// Detects "gopath mode" when GOPATH contains several paths ex. "d:\\dir\\gopath;f:\\dir\\gopath2" // Detects "gopath mode" when GOPATH contains several paths ex. "d:\\dir\\gopath;f:\\dir\\gopath2"
if strings.Contains(wd, curpath) { if strings.Contains(wd, curpath) {
return filepath.Join(curpath, "src", "github.com", "derekparker", "delve") return filepath.Join(curpath, "src", "github.com", "go-delve", "delve")
} }
} }
val, err := exec.Command("go", "list", "-m", "-f", "{{ .Dir }}").Output() val, err := exec.Command("go", "list", "-m", "-f", "{{ .Dir }}").Output()
@ -168,7 +168,7 @@ func testOutput(t *testing.T, dlvbin, output string, delveCmds []string) (stdout
if strings.ToLower(os.Getenv("APPVEYOR")) != "true" { if strings.ToLower(os.Getenv("APPVEYOR")) != "true" {
// Sometimes delve on Appveyor can't remove the built binary before // Sometimes delve on Appveyor can't remove the built binary before
// exiting and gets an "Access is denied" error when trying. // exiting and gets an "Access is denied" error when trying.
// See: https://ci.appveyor.com/project/derekparker/delve/build/1527 // See: https://ci.appveyor.com/project/go-delve/delve/build/1527
t.Errorf("running %q: file %v was not deleted\nstdout is %q, stderr is %q", delveCmds, debugbin, stdout, stderr) t.Errorf("running %q: file %v was not deleted\nstdout is %q, stderr is %q", delveCmds, debugbin, stdout, stderr)
} }
return return
@ -187,9 +187,9 @@ func getDlvBin(t *testing.T) (string, string) {
} }
dlvbin := filepath.Join(tmpdir, "dlv.exe") dlvbin := filepath.Join(tmpdir, "dlv.exe")
out, err := exec.Command("go", "build", "-o", dlvbin, "github.com/derekparker/delve/cmd/dlv").CombinedOutput() out, err := exec.Command("go", "build", "-o", dlvbin, "github.com/go-delve/delve/cmd/dlv").CombinedOutput()
if err != nil { if err != nil {
t.Fatalf("go build -o %v github.com/derekparker/delve/cmd/dlv: %v\n%s", dlvbin, err, string(out)) t.Fatalf("go build -o %v github.com/go-delve/delve/cmd/dlv: %v\n%s", dlvbin, err, string(out))
} }
return dlvbin, tmpdir return dlvbin, tmpdir

4
cmd/dlv/main.go
View File

@ -3,8 +3,8 @@ package main
import ( import (
"os" "os"
"github.com/derekparker/delve/cmd/dlv/cmds" "github.com/go-delve/delve/cmd/dlv/cmds"
"github.com/derekparker/delve/pkg/version" "github.com/go-delve/delve/pkg/version"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

4
pkg/dwarf/dwarfbuilder/info.go
View File

@ -5,8 +5,8 @@ import (
"debug/dwarf" "debug/dwarf"
"encoding/binary" "encoding/binary"
"github.com/derekparker/delve/pkg/dwarf/godwarf" "github.com/go-delve/delve/pkg/dwarf/godwarf"
"github.com/derekparker/delve/pkg/dwarf/util" "github.com/go-delve/delve/pkg/dwarf/util"
) )
// Form represents a DWARF form kind (see Figure 20, page 160 and following, // Form represents a DWARF form kind (see Figure 20, page 160 and following,

4
pkg/dwarf/dwarfbuilder/loc.go
View File

@ -3,8 +3,8 @@ package dwarfbuilder
import ( import (
"bytes" "bytes"
"github.com/derekparker/delve/pkg/dwarf/op" "github.com/go-delve/delve/pkg/dwarf/op"
"github.com/derekparker/delve/pkg/dwarf/util" "github.com/go-delve/delve/pkg/dwarf/util"
) )
// LocEntry represents one entry of debug_loc. // LocEntry represents one entry of debug_loc.

2
pkg/dwarf/frame/parser.go
View File

@ -7,7 +7,7 @@ import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"github.com/derekparker/delve/pkg/dwarf/util" "github.com/go-delve/delve/pkg/dwarf/util"
) )
type parsefunc func(*parseContext) parsefunc type parsefunc func(*parseContext) parsefunc

2
pkg/dwarf/frame/parser_test.go
View File

@ -6,7 +6,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/derekparker/delve/pkg/dwarf/frame" "github.com/go-delve/delve/pkg/dwarf/frame"
"github.com/pkg/profile" "github.com/pkg/profile"
) )

2
pkg/dwarf/frame/table.go
View File

@ -5,7 +5,7 @@ import (
"encoding/binary" "encoding/binary"
"fmt" "fmt"
"github.com/derekparker/delve/pkg/dwarf/util" "github.com/go-delve/delve/pkg/dwarf/util"
) )
type DWRule struct { type DWRule struct {

4
pkg/dwarf/godwarf/type.go
View File

@ -16,8 +16,8 @@ import (
"reflect" "reflect"
"strconv" "strconv"
"github.com/derekparker/delve/pkg/dwarf/op" "github.com/go-delve/delve/pkg/dwarf/op"
"github.com/derekparker/delve/pkg/dwarf/util" "github.com/go-delve/delve/pkg/dwarf/util"
) )
const ( const (

2
pkg/dwarf/line/line_parser.go
View File

@ -5,7 +5,7 @@ import (
"encoding/binary" "encoding/binary"
"path/filepath" "path/filepath"
"github.com/derekparker/delve/pkg/dwarf/util" "github.com/go-delve/delve/pkg/dwarf/util"
) )
type DebugLinePrologue struct { type DebugLinePrologue struct {

2
pkg/dwarf/line/line_parser_test.go
View File

@ -14,7 +14,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/derekparker/delve/pkg/dwarf/godwarf" "github.com/go-delve/delve/pkg/dwarf/godwarf"
"github.com/pkg/profile" "github.com/pkg/profile"
) )

2
pkg/dwarf/line/state_machine.go
View File

@ -7,7 +7,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/derekparker/delve/pkg/dwarf/util" "github.com/go-delve/delve/pkg/dwarf/util"
) )
type Location struct { type Location struct {

2
pkg/dwarf/op/op.go
View File

@ -7,7 +7,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/derekparker/delve/pkg/dwarf/util" "github.com/go-delve/delve/pkg/dwarf/util"
) )
type Opcode byte type Opcode byte

2
pkg/dwarf/reader/reader.go
View File

@ -5,7 +5,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/derekparker/delve/pkg/dwarf/op" "github.com/go-delve/delve/pkg/dwarf/op"
) )
type Reader struct { type Reader struct {

4
pkg/proc/arch.go
View File

@ -3,8 +3,8 @@ package proc
import ( import (
"encoding/binary" "encoding/binary"
"github.com/derekparker/delve/pkg/dwarf/frame" "github.com/go-delve/delve/pkg/dwarf/frame"
"github.com/derekparker/delve/pkg/dwarf/op" "github.com/go-delve/delve/pkg/dwarf/op"
"golang.org/x/arch/x86/x86asm" "golang.org/x/arch/x86/x86asm"
) )

12
pkg/proc/bininfo.go
View File

@ -18,12 +18,12 @@ import (
"sync" "sync"
"time" "time"
"github.com/derekparker/delve/pkg/dwarf/frame" "github.com/go-delve/delve/pkg/dwarf/frame"
"github.com/derekparker/delve/pkg/dwarf/godwarf" "github.com/go-delve/delve/pkg/dwarf/godwarf"
"github.com/derekparker/delve/pkg/dwarf/line" "github.com/go-delve/delve/pkg/dwarf/line"
"github.com/derekparker/delve/pkg/dwarf/op" "github.com/go-delve/delve/pkg/dwarf/op"
"github.com/derekparker/delve/pkg/dwarf/reader" "github.com/go-delve/delve/pkg/dwarf/reader"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
) )
// BinaryInfo holds information on the binary being executed. // BinaryInfo holds information on the binary being executed.

2
pkg/proc/core/core.go
View File

@ -6,7 +6,7 @@ import (
"go/ast" "go/ast"
"io" "io"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
// A SplicedMemory represents a memory space formed from multiple regions, // A SplicedMemory represents a memory space formed from multiple regions,

6
pkg/proc/core/core_test.go
View File

@ -15,9 +15,9 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/test" "github.com/go-delve/delve/pkg/proc/test"
) )
var buildMode string var buildMode string

4
pkg/proc/core/linux_amd64_core.go
View File

@ -9,8 +9,8 @@ import (
"os" "os"
"strings" "strings"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/linutil" "github.com/go-delve/delve/pkg/proc/linutil"
) )
// Copied from golang.org/x/sys/unix.Timeval since it's not available on all // Copied from golang.org/x/sys/unix.Timeval since it's not available on all

2
pkg/proc/core/minidump/minidump.go
View File

@ -24,7 +24,7 @@ import (
"unicode/utf16" "unicode/utf16"
"unsafe" "unsafe"
"github.com/derekparker/delve/pkg/proc/winutil" "github.com/go-delve/delve/pkg/proc/winutil"
) )
type minidumpBuf struct { type minidumpBuf struct {

8
pkg/proc/core/windows_amd64_minidump.go
View File

@ -1,10 +1,10 @@
package core package core
import ( import (
"github.com/derekparker/delve/pkg/logflags" "github.com/go-delve/delve/pkg/logflags"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/core/minidump" "github.com/go-delve/delve/pkg/proc/core/minidump"
"github.com/derekparker/delve/pkg/proc/winutil" "github.com/go-delve/delve/pkg/proc/winutil"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

10
pkg/proc/dwarf_expr_test.go
View File

@ -12,11 +12,11 @@ import (
"go/constant" "go/constant"
"testing" "testing"
"github.com/derekparker/delve/pkg/dwarf/dwarfbuilder" "github.com/go-delve/delve/pkg/dwarf/dwarfbuilder"
"github.com/derekparker/delve/pkg/dwarf/godwarf" "github.com/go-delve/delve/pkg/dwarf/godwarf"
"github.com/derekparker/delve/pkg/dwarf/op" "github.com/go-delve/delve/pkg/dwarf/op"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/linutil" "github.com/go-delve/delve/pkg/proc/linutil"
) )
const defaultCFA = 0xc420051d00 const defaultCFA = 0xc420051d00

6
pkg/proc/eval.go
View File

@ -14,9 +14,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/derekparker/delve/pkg/dwarf/godwarf" "github.com/go-delve/delve/pkg/dwarf/godwarf"
"github.com/derekparker/delve/pkg/dwarf/reader" "github.com/go-delve/delve/pkg/dwarf/reader"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
) )
var errOperationOnSpecialFloat = errors.New("operations on non-finite floats not implemented") var errOperationOnSpecialFloat = errors.New("operations on non-finite floats not implemented")

8
pkg/proc/fncall.go
View File

@ -11,10 +11,10 @@ import (
"reflect" "reflect"
"sort" "sort"
"github.com/derekparker/delve/pkg/dwarf/godwarf" "github.com/go-delve/delve/pkg/dwarf/godwarf"
"github.com/derekparker/delve/pkg/dwarf/op" "github.com/go-delve/delve/pkg/dwarf/op"
"github.com/derekparker/delve/pkg/dwarf/reader" "github.com/go-delve/delve/pkg/dwarf/reader"
"github.com/derekparker/delve/pkg/logflags" "github.com/go-delve/delve/pkg/logflags"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/arch/x86/x86asm" "golang.org/x/arch/x86/x86asm"
) )

6
pkg/proc/gdbserial/gdbserver.go
View File

@ -79,9 +79,9 @@ import (
"golang.org/x/arch/x86/x86asm" "golang.org/x/arch/x86/x86asm"
"github.com/derekparker/delve/pkg/logflags" "github.com/go-delve/delve/pkg/logflags"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/linutil" "github.com/go-delve/delve/pkg/proc/linutil"
isatty "github.com/mattn/go-isatty" isatty "github.com/mattn/go-isatty"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

4
pkg/proc/gdbserial/gdbserver_conn.go
View File

@ -16,8 +16,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/derekparker/delve/pkg/logflags" "github.com/go-delve/delve/pkg/logflags"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

8
pkg/proc/gdbserial/rr_test.go
View File

@ -9,10 +9,10 @@ import (
"runtime" "runtime"
"testing" "testing"
"github.com/derekparker/delve/pkg/logflags" "github.com/go-delve/delve/pkg/logflags"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/gdbserial" "github.com/go-delve/delve/pkg/proc/gdbserial"
protest "github.com/derekparker/delve/pkg/proc/test" protest "github.com/go-delve/delve/pkg/proc/test"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {

2
pkg/proc/linutil/regs.go
View File

@ -7,7 +7,7 @@ import (
"golang.org/x/arch/x86/x86asm" "golang.org/x/arch/x86/x86asm"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
// AMD64Registers implements the proc.Registers interface for the native/linux // AMD64Registers implements the proc.Registers interface for the native/linux

2
pkg/proc/mem.go
View File

@ -4,7 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/derekparker/delve/pkg/dwarf/op" "github.com/go-delve/delve/pkg/dwarf/op"
) )
const cacheEnabled = true const cacheEnabled = true

2
pkg/proc/native/nonative_darwin.go
View File

@ -6,7 +6,7 @@ import (
"errors" "errors"
"sync" "sync"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
var ErrNativeBackendDisabled = errors.New("native backend disabled during compilation") var ErrNativeBackendDisabled = errors.New("native backend disabled during compilation")

2
pkg/proc/native/proc.go
View File

@ -6,7 +6,7 @@ import (
"runtime" "runtime"
"sync" "sync"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
// Process represents all of the information the debugger // Process represents all of the information the debugger

2
pkg/proc/native/proc_darwin.go
View File

@ -17,7 +17,7 @@ import (
sys "golang.org/x/sys/unix" sys "golang.org/x/sys/unix"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
// OSProcessDetails holds Darwin specific information. // OSProcessDetails holds Darwin specific information.

4
pkg/proc/native/proc_linux.go
View File

@ -17,8 +17,8 @@ import (
sys "golang.org/x/sys/unix" sys "golang.org/x/sys/unix"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/linutil" "github.com/go-delve/delve/pkg/proc/linutil"
isatty "github.com/mattn/go-isatty" isatty "github.com/mattn/go-isatty"
) )

2
pkg/proc/native/proc_windows.go
View File

@ -12,7 +12,7 @@ import (
sys "golang.org/x/sys/windows" sys "golang.org/x/sys/windows"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
// OSProcessDetails holds Windows specific information. // OSProcessDetails holds Windows specific information.

4
pkg/proc/native/ptrace_linux.go
View File

@ -6,7 +6,7 @@ import (
sys "golang.org/x/sys/unix" sys "golang.org/x/sys/unix"
"github.com/derekparker/delve/pkg/proc/linutil" "github.com/go-delve/delve/pkg/proc/linutil"
) )
// PtraceAttach executes the sys.PtraceAttach call. // PtraceAttach executes the sys.PtraceAttach call.
@ -69,7 +69,7 @@ func PtraceGetRegset(tid int) (regset linutil.AMD64Xstate, err error) {
_, _, err = syscall.Syscall6(syscall.SYS_PTRACE, sys.PTRACE_GETREGSET, uintptr(tid), _NT_X86_XSTATE, uintptr(unsafe.Pointer(&iov)), 0, 0) _, _, err = syscall.Syscall6(syscall.SYS_PTRACE, sys.PTRACE_GETREGSET, uintptr(tid), _NT_X86_XSTATE, uintptr(unsafe.Pointer(&iov)), 0, 0)
if err != syscall.Errno(0) { if err != syscall.Errno(0) {
if err == syscall.ENODEV || err == syscall.EIO { if err == syscall.ENODEV || err == syscall.EIO {
// ignore ENODEV, it just means this CPU or kernel doesn't support XSTATE, see https://github.com/derekparker/delve/issues/1022 // ignore ENODEV, it just means this CPU or kernel doesn't support XSTATE, see https://github.com/go-delve/delve/issues/1022
// also ignore EIO, it means that we are running on an old kernel (pre 2.6.34) and PTRACE_GETREGSET is not implemented // also ignore EIO, it means that we are running on an old kernel (pre 2.6.34) and PTRACE_GETREGSET is not implemented
err = nil err = nil
} }

2
pkg/proc/native/registers_darwin_amd64.go
View File

@ -12,7 +12,7 @@ import (
"golang.org/x/arch/x86/x86asm" "golang.org/x/arch/x86/x86asm"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
// Regs represents CPU registers on an AMD64 processor. // Regs represents CPU registers on an AMD64 processor.

4
pkg/proc/native/registers_linux_amd64.go
View File

@ -5,8 +5,8 @@ import (
sys "golang.org/x/sys/unix" sys "golang.org/x/sys/unix"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/linutil" "github.com/go-delve/delve/pkg/proc/linutil"
) )
// SetPC sets RIP to the value specified by 'pc'. // SetPC sets RIP to the value specified by 'pc'.

4
pkg/proc/native/registers_windows_amd64.go
View File

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"unsafe" "unsafe"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/winutil" "github.com/go-delve/delve/pkg/proc/winutil"
) )
// SetPC sets the RIP register to the value specified by `pc`. // SetPC sets the RIP register to the value specified by `pc`.

2
pkg/proc/native/syscall_windows.go
View File

@ -5,7 +5,7 @@ package native
import ( import (
"syscall" "syscall"
"github.com/derekparker/delve/pkg/proc/winutil" "github.com/go-delve/delve/pkg/proc/winutil"
) )
type _NTSTATUS int32 type _NTSTATUS int32

2
pkg/proc/native/threads.go
View File

@ -3,7 +3,7 @@ package native
import ( import (
"fmt" "fmt"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
// Thread represents a single thread in the traced process // Thread represents a single thread in the traced process

2
pkg/proc/native/threads_darwin.go
View File

@ -12,7 +12,7 @@ import (
sys "golang.org/x/sys/unix" sys "golang.org/x/sys/unix"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
// WaitStatus is a synonym for the platform-specific WaitStatus // WaitStatus is a synonym for the platform-specific WaitStatus

4
pkg/proc/native/threads_linux.go
View File

@ -7,8 +7,8 @@ import (
sys "golang.org/x/sys/unix" sys "golang.org/x/sys/unix"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/linutil" "github.com/go-delve/delve/pkg/proc/linutil"
) )
type WaitStatus sys.WaitStatus type WaitStatus sys.WaitStatus

4
pkg/proc/native/threads_windows.go
View File

@ -6,8 +6,8 @@ import (
sys "golang.org/x/sys/windows" sys "golang.org/x/sys/windows"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/winutil" "github.com/go-delve/delve/pkg/proc/winutil"
) )
// WaitStatus is a synonym for the platform-specific WaitStatus // WaitStatus is a synonym for the platform-specific WaitStatus

2
pkg/proc/proc.go
View File

@ -93,7 +93,7 @@ func (err *ErrFunctionNotFound) Error() string {
// If lineOffset is passed FindFunctionLocation will return the address of that line // If lineOffset is passed FindFunctionLocation will return the address of that line
// Pass lineOffset == 0 and firstLine == false if you want the address for the function's entry point // Pass lineOffset == 0 and firstLine == false if you want the address for the function's entry point
// Note that setting breakpoints at that address will cause surprising behavior: // Note that setting breakpoints at that address will cause surprising behavior:
// https://github.com/derekparker/delve/issues/170 // https://github.com/go-delve/delve/issues/170
func FindFunctionLocation(p Process, funcName string, firstLine bool, lineOffset int) (uint64, error) { func FindFunctionLocation(p Process, funcName string, firstLine bool, lineOffset int) (uint64, error) {
bi := p.BinInfo() bi := p.BinInfo()
origfn := bi.LookupFunc[funcName] origfn := bi.LookupFunc[funcName]

4
pkg/proc/proc_linux_test.go
View File

@ -6,8 +6,8 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/derekparker/delve/pkg/proc/native" "github.com/go-delve/delve/pkg/proc/native"
protest "github.com/derekparker/delve/pkg/proc/test" protest "github.com/go-delve/delve/pkg/proc/test"
) )
func TestLoadingExternalDebugInfo(t *testing.T) { func TestLoadingExternalDebugInfo(t *testing.T) {

14
pkg/proc/proc_test.go
View File

@ -19,13 +19,13 @@ import (
"testing" "testing"
"time" "time"
"github.com/derekparker/delve/pkg/dwarf/frame" "github.com/go-delve/delve/pkg/dwarf/frame"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
"github.com/derekparker/delve/pkg/logflags" "github.com/go-delve/delve/pkg/logflags"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/gdbserial" "github.com/go-delve/delve/pkg/proc/gdbserial"
"github.com/derekparker/delve/pkg/proc/native" "github.com/go-delve/delve/pkg/proc/native"
protest "github.com/derekparker/delve/pkg/proc/test" protest "github.com/go-delve/delve/pkg/proc/test"
) )
var normalLoadConfig = proc.LoadConfig{true, 1, 64, 64, -1, 0} var normalLoadConfig = proc.LoadConfig{true, 1, 64, 64, -1, 0}

4
pkg/proc/proc_unix_test.go
View File

@ -9,8 +9,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
protest "github.com/derekparker/delve/pkg/proc/test" protest "github.com/go-delve/delve/pkg/proc/test"
) )
type errIssue419 struct { type errIssue419 struct {

6
pkg/proc/scope_test.go
View File

@ -13,9 +13,9 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
protest "github.com/derekparker/delve/pkg/proc/test" protest "github.com/go-delve/delve/pkg/proc/test"
) )
func TestScopeWithEscapedVariable(t *testing.T) { func TestScopeWithEscapedVariable(t *testing.T) {

6
pkg/proc/stack.go
View File

@ -7,9 +7,9 @@ import (
"go/constant" "go/constant"
"strings" "strings"
"github.com/derekparker/delve/pkg/dwarf/frame" "github.com/go-delve/delve/pkg/dwarf/frame"
"github.com/derekparker/delve/pkg/dwarf/op" "github.com/go-delve/delve/pkg/dwarf/op"
"github.com/derekparker/delve/pkg/dwarf/reader" "github.com/go-delve/delve/pkg/dwarf/reader"
) )
// This code is partly adapted from runtime.gentraceback in // This code is partly adapted from runtime.gentraceback in

2
pkg/proc/test/support.go
View File

@ -13,7 +13,7 @@ import (
"sync" "sync"
"testing" "testing"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
) )
// EnableRace allows to configure whether the race detector is enabled on target process. // EnableRace allows to configure whether the race detector is enabled on target process.

4
pkg/proc/threads.go
View File

@ -10,8 +10,8 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/derekparker/delve/pkg/dwarf/godwarf" "github.com/go-delve/delve/pkg/dwarf/godwarf"
"github.com/derekparker/delve/pkg/dwarf/reader" "github.com/go-delve/delve/pkg/dwarf/reader"
) )
// Thread represents a thread. // Thread represents a thread.

12
pkg/proc/types.go
View File

@ -18,12 +18,12 @@ import (
"sync" "sync"
"unsafe" "unsafe"
"github.com/derekparker/delve/pkg/dwarf/godwarf" "github.com/go-delve/delve/pkg/dwarf/godwarf"
"github.com/derekparker/delve/pkg/dwarf/line" "github.com/go-delve/delve/pkg/dwarf/line"
"github.com/derekparker/delve/pkg/dwarf/op" "github.com/go-delve/delve/pkg/dwarf/op"
"github.com/derekparker/delve/pkg/dwarf/reader" "github.com/go-delve/delve/pkg/dwarf/reader"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
"github.com/derekparker/delve/pkg/logflags" "github.com/go-delve/delve/pkg/logflags"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

4
pkg/proc/variable_test.go
View File

@ -4,8 +4,8 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
protest "github.com/derekparker/delve/pkg/proc/test" protest "github.com/go-delve/delve/pkg/proc/test"
) )
func TestGoroutineCreationLocation(t *testing.T) { func TestGoroutineCreationLocation(t *testing.T) {

6
pkg/proc/variables.go
View File

@ -15,9 +15,9 @@ import (
"strings" "strings"
"unsafe" "unsafe"
"github.com/derekparker/delve/pkg/dwarf/godwarf" "github.com/go-delve/delve/pkg/dwarf/godwarf"
"github.com/derekparker/delve/pkg/dwarf/op" "github.com/go-delve/delve/pkg/dwarf/op"
"github.com/derekparker/delve/pkg/dwarf/reader" "github.com/go-delve/delve/pkg/dwarf/reader"
) )
const ( const (

2
pkg/proc/winutil/regs.go
View File

@ -6,7 +6,7 @@ import (
"golang.org/x/arch/x86/x86asm" "golang.org/x/arch/x86/x86asm"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
// AMD64Registers represents CPU registers on an AMD64 processor. // AMD64Registers represents CPU registers on an AMD64 processor.

14
pkg/terminal/command.go
View File

@ -20,9 +20,9 @@ import (
"text/tabwriter" "text/tabwriter"
"github.com/cosiner/argv" "github.com/cosiner/argv"
"github.com/derekparker/delve/service" "github.com/go-delve/delve/service"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
"github.com/derekparker/delve/service/debugger" "github.com/go-delve/delve/service/debugger"
) )
const optimizedFunctionWarning = "Warning: debugging optimized function" const optimizedFunctionWarning = "Warning: debugging optimized function"
@ -114,14 +114,14 @@ Type "help" followed by the name of a command for more information about it.`},
break [name] <linespec> break [name] <linespec>
See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. See $GOPATH/src/github.com/go-delve/delve/Documentation/cli/locspec.md for the syntax of linespec.
See also: "help on", "help cond" and "help clear"`}, See also: "help on", "help cond" and "help clear"`},
{aliases: []string{"trace", "t"}, cmdFn: tracepoint, helpMsg: `Set tracepoint. {aliases: []string{"trace", "t"}, cmdFn: tracepoint, helpMsg: `Set tracepoint.
trace [name] <linespec> trace [name] <linespec>
A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See $GOPATH/src/github.com/go-delve/delve/Documentation/cli/locspec.md for the syntax of linespec.
See also: "help on", "help cond" and "help clear"`}, See also: "help on", "help cond" and "help clear"`},
{aliases: []string{"restart", "r"}, cmdFn: restart, helpMsg: `Restart process. {aliases: []string{"restart", "r"}, cmdFn: restart, helpMsg: `Restart process.
@ -193,7 +193,7 @@ Called with more arguments it will execute a command on the specified goroutine.
[goroutine <n>] [frame <m>] print <expression> [goroutine <n>] [frame <m>] print <expression>
See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions.`}, See $GOPATH/src/github.com/go-delve/delve/Documentation/cli/expr.md for a description of supported expressions.`},
{aliases: []string{"whatis"}, cmdFn: whatisCommand, helpMsg: `Prints type of an expression. {aliases: []string{"whatis"}, cmdFn: whatisCommand, helpMsg: `Prints type of an expression.
whatis <expression>`}, whatis <expression>`},
@ -201,7 +201,7 @@ See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a des
[goroutine <n>] [frame <m>] set <variable> = <value> [goroutine <n>] [frame <m>] set <variable> = <value>
See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, See $GOPATH/src/github.com/go-delve/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`},
{aliases: []string{"sources"}, cmdFn: sources, helpMsg: `Print list of source files. {aliases: []string{"sources"}, cmdFn: sources, helpMsg: `Print list of source files.
sources [<regex>] sources [<regex>]

14
pkg/terminal/command_test.go
View File

@ -15,13 +15,13 @@ import (
"testing" "testing"
"time" "time"
"github.com/derekparker/delve/pkg/config" "github.com/go-delve/delve/pkg/config"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
"github.com/derekparker/delve/pkg/proc/test" "github.com/go-delve/delve/pkg/proc/test"
"github.com/derekparker/delve/service" "github.com/go-delve/delve/service"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
"github.com/derekparker/delve/service/rpc2" "github.com/go-delve/delve/service/rpc2"
"github.com/derekparker/delve/service/rpccommon" "github.com/go-delve/delve/service/rpccommon"
) )
var testBackend, buildMode string var testBackend, buildMode string

2
pkg/terminal/config.go
View File

@ -8,7 +8,7 @@ import (
"strings" "strings"
"text/tabwriter" "text/tabwriter"
"github.com/derekparker/delve/pkg/config" "github.com/go-delve/delve/pkg/config"
) )
func configureCmd(t *Term, ctx callContext, args string) error { func configureCmd(t *Term, ctx callContext, args string) error {

2
pkg/terminal/disasmprint.go
View File

@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"text/tabwriter" "text/tabwriter"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
) )
func DisasmPrint(dv api.AsmInstructions, out io.Writer) { func DisasmPrint(dv api.AsmInstructions, out io.Writer) {

4
pkg/terminal/docgen.go
View File

@ -7,7 +7,7 @@ import (
) )
func replaceDocPath(s string) string { func replaceDocPath(s string) string {
const docpath = "$GOPATH/src/github.com/derekparker/delve/" const docpath = "$GOPATH/src/github.com/go-delve/delve/"
for { for {
start := strings.Index(s, docpath) start := strings.Index(s, docpath)
@ -22,7 +22,7 @@ func replaceDocPath(s string) string {
} }
text := s[start+len(docpath) : end] text := s[start+len(docpath) : end]
s = s[:start] + fmt.Sprintf("[%s](//github.com/derekparker/delve/tree/master/%s)", text, text) + s[end:] s = s[:start] + fmt.Sprintf("[%s](//github.com/go-delve/delve/tree/master/%s)", text, text) + s[end:]
} }
} }

6
pkg/terminal/terminal.go
View File

@ -13,9 +13,9 @@ import (
"github.com/peterh/liner" "github.com/peterh/liner"
"github.com/derekparker/delve/pkg/config" "github.com/go-delve/delve/pkg/config"
"github.com/derekparker/delve/service" "github.com/go-delve/delve/service"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
) )
const ( const (

2
pkg/terminal/terminal_test.go
View File

@ -4,7 +4,7 @@ import (
"runtime" "runtime"
"testing" "testing"
"github.com/derekparker/delve/pkg/config" "github.com/go-delve/delve/pkg/config"
) )
type tRule struct { type tRule struct {

4
scripts/gen-cli-docs.go
View File

@ -7,11 +7,11 @@ import (
"log" "log"
"os" "os"
"github.com/derekparker/delve/pkg/terminal" "github.com/go-delve/delve/pkg/terminal"
) )
func main() { func main() {
fh, err := os.Create(os.ExpandEnv("$GOPATH/src/github.com/derekparker/delve/Documentation/cli/README.md")) fh, err := os.Create(os.ExpandEnv("$GOPATH/src/github.com/go-delve/delve/Documentation/cli/README.md"))
if err != nil { if err != nil {
log.Fatalf("could not create README.md: %v", err) log.Fatalf("could not create README.md: %v", err)
} }

2
scripts/gen-usage-docs.go
View File

@ -3,7 +3,7 @@
package main package main
import ( import (
"github.com/derekparker/delve/cmd/dlv/cmds" "github.com/go-delve/delve/cmd/dlv/cmds"
"github.com/spf13/cobra/doc" "github.com/spf13/cobra/doc"
) )

8
scripts/make.go
View File

@ -13,7 +13,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
const DelveMainPackagePath = "github.com/derekparker/delve/cmd/dlv" const DelveMainPackagePath = "github.com/go-delve/delve/cmd/dlv"
var Verbose bool var Verbose bool
var TestSet, TestRegex, TestBackend, TestBuildMode string var TestSet, TestRegex, TestBackend, TestBuildMode string
@ -75,7 +75,7 @@ Use the flags -s, -r and -b to specify which tests to run. Specifying nothing is
test.PersistentFlags().StringVarP(&TestSet, "test-set", "s", "", `Select the set of tests to run, one of either: test.PersistentFlags().StringVarP(&TestSet, "test-set", "s", "", `Select the set of tests to run, one of either:
all tests all packages all tests all packages
basic tests proc, integration and terminal basic tests proc, integration and terminal
integration tests github.com/derekparker/delve/service/test integration tests github.com/go-delve/delve/service/test
package-name test the specified package only package-name test the specified package only
`) `)
test.PersistentFlags().StringVarP(&TestRegex, "test-run", "r", "", `Only runs the tests matching the specified regex. This option can only be specified if testset is a single package`) test.PersistentFlags().StringVarP(&TestRegex, "test-run", "r", "", `Only runs the tests matching the specified regex. This option can only be specified if testset is a single package`)
@ -362,10 +362,10 @@ func testSetToPackages(testSet string) []string {
return allPackages() return allPackages()
case "basic": case "basic":
return []string{"github.com/derekparker/delve/pkg/proc", "github.com/derekparker/delve/service/test", "github.com/derekparker/delve/pkg/terminal"} return []string{"github.com/go-delve/delve/pkg/proc", "github.com/go-delve/delve/service/test", "github.com/go-delve/delve/pkg/terminal"}
case "integration": case "integration":
return []string{"github.com/derekparker/delve/service/test"} return []string{"github.com/go-delve/delve/service/test"}
default: default:
for _, pkg := range allPackages() { for _, pkg := range allPackages() {

4
service/api/conversions.go
View File

@ -8,8 +8,8 @@ import (
"reflect" "reflect"
"strconv" "strconv"
"github.com/derekparker/delve/pkg/dwarf/godwarf" "github.com/go-delve/delve/pkg/dwarf/godwarf"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
// ConvertBreakpoint converts from a proc.Breakpoint to // ConvertBreakpoint converts from a proc.Breakpoint to

2
service/api/types.go
View File

@ -8,7 +8,7 @@ import (
"strconv" "strconv"
"unicode" "unicode"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
// ErrNotExecutable is an error returned when trying // ErrNotExecutable is an error returned when trying

2
service/client.go
View File

@ -3,7 +3,7 @@ package service
import ( import (
"time" "time"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
) )
// Client represents a debugger service client. All client methods are // Client represents a debugger service client. All client methods are

14
service/debugger/debugger.go
View File

@ -13,13 +13,13 @@ import (
"sync" "sync"
"time" "time"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
"github.com/derekparker/delve/pkg/logflags" "github.com/go-delve/delve/pkg/logflags"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/core" "github.com/go-delve/delve/pkg/proc/core"
"github.com/derekparker/delve/pkg/proc/gdbserial" "github.com/go-delve/delve/pkg/proc/gdbserial"
"github.com/derekparker/delve/pkg/proc/native" "github.com/go-delve/delve/pkg/proc/native"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

4
service/debugger/locations.go
View File

@ -9,8 +9,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
) )
const maxFindLocationCandidates = 5 const maxFindLocationCandidates = 5

12
service/debugger/locations_test.go
View File

@ -57,12 +57,12 @@ func TestFunctionLocationParsing(t *testing.T) {
assertNormalLocationSpec(t, "Continue:10", NormalLocationSpec{"Continue", &FuncLocationSpec{BaseName: "Continue"}, 10}) assertNormalLocationSpec(t, "Continue:10", NormalLocationSpec{"Continue", &FuncLocationSpec{BaseName: "Continue"}, 10})
// Function locations, package paths, no line offsets // Function locations, package paths, no line offsets
assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.(*Process).Continue", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, -1}) assertNormalLocationSpec(t, "github.com/go-delve/delve/pkg/proc.(*Process).Continue", NormalLocationSpec{"github.com/go-delve/delve/pkg/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/go-delve/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, -1})
assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.Process.Continue", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, -1}) assertNormalLocationSpec(t, "github.com/go-delve/delve/pkg/proc.Process.Continue", NormalLocationSpec{"github.com/go-delve/delve/pkg/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/go-delve/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, -1})
assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.Continue", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", BaseName: "Continue"}, -1}) assertNormalLocationSpec(t, "github.com/go-delve/delve/pkg/proc.Continue", NormalLocationSpec{"github.com/go-delve/delve/pkg/proc.Continue", &FuncLocationSpec{PackageName: "github.com/go-delve/delve/pkg/proc", BaseName: "Continue"}, -1})
// Function locations, package paths, line offsets // Function locations, package paths, line offsets
assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.(*Process).Continue:10", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, 10}) assertNormalLocationSpec(t, "github.com/go-delve/delve/pkg/proc.(*Process).Continue:10", NormalLocationSpec{"github.com/go-delve/delve/pkg/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/go-delve/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, 10})
assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.Process.Continue:10", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, 10}) assertNormalLocationSpec(t, "github.com/go-delve/delve/pkg/proc.Process.Continue:10", NormalLocationSpec{"github.com/go-delve/delve/pkg/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/go-delve/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, 10})
assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.Continue:10", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", BaseName: "Continue"}, 10}) assertNormalLocationSpec(t, "github.com/go-delve/delve/pkg/proc.Continue:10", NormalLocationSpec{"github.com/go-delve/delve/pkg/proc.Continue", &FuncLocationSpec{PackageName: "github.com/go-delve/delve/pkg/proc", BaseName: "Continue"}, 10})
} }

2
service/rpc1/client.go
View File

@ -9,7 +9,7 @@ import (
"sync" "sync"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
) )
// Client is a RPC service.Client. // Client is a RPC service.Client.

8
service/rpc1/server.go
View File

@ -4,10 +4,10 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/service" "github.com/go-delve/delve/service"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
"github.com/derekparker/delve/service/debugger" "github.com/go-delve/delve/service/debugger"
) )
var defaultLoadConfig = proc.LoadConfig{true, 1, 64, 64, -1, 0} var defaultLoadConfig = proc.LoadConfig{true, 1, 64, 64, -1, 0}

4
service/rpc2/client.go
View File

@ -8,8 +8,8 @@ import (
"net/rpc/jsonrpc" "net/rpc/jsonrpc"
"time" "time"
"github.com/derekparker/delve/service" "github.com/go-delve/delve/service"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
) )
// Client is a RPC service.Client. // Client is a RPC service.Client.

8
service/rpc2/server.go
View File

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/derekparker/delve/service" "github.com/go-delve/delve/service"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
"github.com/derekparker/delve/service/debugger" "github.com/go-delve/delve/service/debugger"
) )
type RPCServer struct { type RPCServer struct {
@ -423,7 +423,7 @@ type EvalOut struct {
// EvalVariable returns a variable in the specified context. // EvalVariable returns a variable in the specified context.
// //
// See https://github.com/derekparker/delve/wiki/Expressions for // See https://github.com/go-delve/delve/wiki/Expressions for
// a description of acceptable values of arg.Expr. // a description of acceptable values of arg.Expr.
func (s *RPCServer) Eval(arg EvalIn, out *EvalOut) error { func (s *RPCServer) Eval(arg EvalIn, out *EvalOut) error {
cfg := arg.Cfg cfg := arg.Cfg

14
service/rpccommon/server.go
View File

@ -16,13 +16,13 @@ import (
"unicode" "unicode"
"unicode/utf8" "unicode/utf8"
"github.com/derekparker/delve/pkg/logflags" "github.com/go-delve/delve/pkg/logflags"
"github.com/derekparker/delve/pkg/version" "github.com/go-delve/delve/pkg/version"
"github.com/derekparker/delve/service" "github.com/go-delve/delve/service"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
"github.com/derekparker/delve/service/debugger" "github.com/go-delve/delve/service/debugger"
"github.com/derekparker/delve/service/rpc1" "github.com/go-delve/delve/service/rpc1"
"github.com/derekparker/delve/service/rpc2" "github.com/go-delve/delve/service/rpc2"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
service/test/common_test.go
View File

@ -8,7 +8,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
) )
func assertNoError(err error, t *testing.T, s string) { func assertNoError(err error, t *testing.T, s string) {

12
service/test/integration1_test.go
View File

@ -11,13 +11,13 @@ import (
"testing" "testing"
"time" "time"
protest "github.com/derekparker/delve/pkg/proc/test" protest "github.com/go-delve/delve/pkg/proc/test"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
"github.com/derekparker/delve/service" "github.com/go-delve/delve/service"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
"github.com/derekparker/delve/service/rpc1" "github.com/go-delve/delve/service/rpc1"
"github.com/derekparker/delve/service/rpccommon" "github.com/go-delve/delve/service/rpccommon"
) )
func withTestClient1(name string, t *testing.T, fn func(c *rpc1.RPCClient)) { func withTestClient1(name string, t *testing.T, fn func(c *rpc1.RPCClient)) {

14
service/test/integration2_test.go
View File

@ -14,14 +14,14 @@ import (
"testing" "testing"
"time" "time"
protest "github.com/derekparker/delve/pkg/proc/test" protest "github.com/go-delve/delve/pkg/proc/test"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
"github.com/derekparker/delve/pkg/logflags" "github.com/go-delve/delve/pkg/logflags"
"github.com/derekparker/delve/service" "github.com/go-delve/delve/service"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
"github.com/derekparker/delve/service/rpc2" "github.com/go-delve/delve/service/rpc2"
"github.com/derekparker/delve/service/rpccommon" "github.com/go-delve/delve/service/rpccommon"
) )
var normalLoadConfig = api.LoadConfig{true, 1, 64, 64, -1} var normalLoadConfig = api.LoadConfig{true, 1, 64, 64, -1}

36
service/test/variables_test.go
View File

@ -8,13 +8,13 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/derekparker/delve/pkg/goversion" "github.com/go-delve/delve/pkg/goversion"
"github.com/derekparker/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
"github.com/derekparker/delve/pkg/proc/gdbserial" "github.com/go-delve/delve/pkg/proc/gdbserial"
"github.com/derekparker/delve/pkg/proc/native" "github.com/go-delve/delve/pkg/proc/native"
"github.com/derekparker/delve/service/api" "github.com/go-delve/delve/service/api"
protest "github.com/derekparker/delve/pkg/proc/test" protest "github.com/go-delve/delve/pkg/proc/test"
) )
var pnormalLoadConfig = proc.LoadConfig{true, 1, 64, 64, -1, 0} var pnormalLoadConfig = proc.LoadConfig{true, 1, 64, 64, -1, 0}
@ -978,20 +978,20 @@ func TestPackageRenames(t *testing.T) {
{"amap", true, "interface {}(map[go/ast.BadExpr]net/http.Request) [{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil}, {"amap", true, "interface {}(map[go/ast.BadExpr]net/http.Request) [{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil},
// Package name that doesn't match import path // Package name that doesn't match import path
{"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, {"iface3", true, `interface {}(*github.com/go-delve/delve/_fixtures/internal/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil},
// Interfaces to anonymous types // Interfaces to anonymous types
{"amap2", true, "interface {}(*map[go/ast.BadExpr]net/http.Request) *[{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil}, {"amap2", true, "interface {}(*map[go/ast.BadExpr]net/http.Request) *[{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil},
{"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, {"dir0someType", true, "interface {}(*github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil},
{"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, {"dir1someType", true, "interface {}(github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil},
{"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, {"amap3", true, "interface {}(map[github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType]github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil},
{"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, {"anarray", true, `interface {}([2]github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil},
{"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, {"achan", true, `interface {}(chan github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType) chan github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType 0/0`, "", "interface {}", nil},
{"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, {"aslice", true, `interface {}([]github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil},
{"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, {"afunc", true, `interface {}(func(github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType, github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil},
{"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, {"astruct", true, `interface {}(*struct { A github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType; B github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType }) *{A: github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil},
{"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, {"astruct2", true, `interface {}(*struct { github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{SomeType: github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil},
{"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil},
{`"dir0/pkg".A`, false, "0", "", "int", nil}, {`"dir0/pkg".A`, false, "0", "", "int", nil},
{`"dir1/pkg".A`, false, "1", "", "int", nil}, {`"dir1/pkg".A`, false, "1", "", "int", nil},
@ -1010,7 +1010,7 @@ func TestPackageRenames(t *testing.T) {
if ver.Major > 0 && !ver.AfterOrEqual(goversion.GoVersion{1, 9, -1, 0, 0, ""}) { if ver.Major > 0 && !ver.AfterOrEqual(goversion.GoVersion{1, 9, -1, 0, 0, ""}) {
// before 1.9 embedded struct field have fieldname == type // before 1.9 embedded struct field have fieldname == type
if tc.name == "astruct2" { if tc.name == "astruct2" {
tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` tc.value = `interface {}(*struct { github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType: github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`
} }
} }
variable, err := evalVariable(p, tc.name, pnormalLoadConfig) variable, err := evalVariable(p, tc.name, pnormalLoadConfig)