golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-10-31 18:57:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc: Source code formatting

Browse Source
This commit is contained in:
Derek Parker
2015-08-17 08:19:04 -05:00
parent f0afd41d94
commit 326e65efbc
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
terminal/command.go
View File

@ -171,12 +171,10 @@ func thread(client service.Client, args ...string) error {
if err != nil { if err != nil {
return err return err
} }
oldState, err := client.GetState() oldState, err := client.GetState()
if err != nil { if err != nil {
return err return err
} }
newState, err := client.SwitchThread(tid) newState, err := client.SwitchThread(tid)
if err != nil { if err != nil {
return err return err
@ -190,7 +188,6 @@ func thread(client service.Client, args ...string) error {
if newState.CurrentThread != nil { if newState.CurrentThread != nil {
newThread = strconv.Itoa(newState.CurrentThread.ID) newThread = strconv.Itoa(newState.CurrentThread.ID)
} }
fmt.Printf("Switched from %s to %s\n", oldThread, newThread) fmt.Printf("Switched from %s to %s\n", oldThread, newThread)
return nil return nil
} }
@ -256,12 +253,10 @@ func clear(client service.Client, args ...string) error {
if len(args) == 0 { if len(args) == 0 {
return fmt.Errorf("not enough arguments") return fmt.Errorf("not enough arguments")
} }
id, err := strconv.Atoi(args[0]) id, err := strconv.Atoi(args[0])
if err != nil { if err != nil {
return err return err
} }
bp, err := client.ClearBreakpoint(id) bp, err := client.ClearBreakpoint(id)
if err != nil { if err != nil {
return err return err
@ -315,12 +310,10 @@ func breakpoints(client service.Client, args ...string) error {
for i := range bp.Variables { for i := range bp.Variables {
attrs = append(attrs, bp.Variables[i]) attrs = append(attrs, bp.Variables[i])
} }
if len(attrs) > 0 { if len(attrs) > 0 {
fmt.Printf("\t%s\n", strings.Join(attrs, " ")) fmt.Printf("\t%s\n", strings.Join(attrs, " "))
} }
} }
return nil return nil
} }
@ -328,7 +321,6 @@ func setBreakpoint(client service.Client, tracepoint bool, args ...string) error
if len(args) < 1 { if len(args) < 1 {
return fmt.Errorf("address required, specify either a function name or <file:line>") return fmt.Errorf("address required, specify either a function name or <file:line>")
} }
requestedBp := &api.Breakpoint{} requestedBp := &api.Breakpoint{}
for i := 1; i < len(args); i++ { for i := 1; i < len(args); i++ {
@ -348,17 +340,14 @@ func setBreakpoint(client service.Client, tracepoint bool, args ...string) error
} }
requestedBp.Tracepoint = tracepoint requestedBp.Tracepoint = tracepoint
locs, err := client.FindLocation(args[0]) locs, err := client.FindLocation(args[0])
if err != nil { if err != nil {
return err return err
} }
thing := "Breakpoint" thing := "Breakpoint"
if tracepoint { if tracepoint {
thing = "Tracepoint" thing = "Tracepoint"
} }
for _, loc := range locs { for _, loc := range locs {
requestedBp.Addr = loc.PC requestedBp.Addr = loc.PC
@ -369,7 +358,6 @@ func setBreakpoint(client service.Client, tracepoint bool, args ...string) error
fmt.Printf("%s %d set at %#v for %s %s:%d\n", thing, bp.ID, bp.Addr, bp.FunctionName, bp.File, bp.Line) fmt.Printf("%s %d set at %#v for %s %s:%d\n", thing, bp.ID, bp.Addr, bp.FunctionName, bp.File, bp.Line)
} }
return nil return nil
} }
@ -385,12 +373,10 @@ func printVar(client service.Client, args ...string) error {
if len(args) == 0 { if len(args) == 0 {
return fmt.Errorf("not enough arguments") return fmt.Errorf("not enough arguments")
} }
val, err := client.EvalVariable(args[0]) val, err := client.EvalVariable(args[0])
if err != nil { if err != nil {
return err return err
} }
fmt.Println(val.Value) fmt.Println(val.Value)
return nil return nil
} }
@ -519,11 +505,9 @@ func listCommand(client service.Client, args ...string) error {
if err != nil { if err != nil {
return err return err
} }
if len(locs) > 1 { if len(locs) > 1 {
return debugger.AmbiguousLocationError{Location: args[0], CandidatesLocation: locs} return debugger.AmbiguousLocationError{Location: args[0], CandidatesLocation: locs}
} }
printfile(locs[0].File, locs[0].Line, false) printfile(locs[0].File, locs[0].Line, false)
return nil return nil
} }
@ -543,13 +527,11 @@ func printcontext(state *api.DebuggerState) error {
fmt.Println("No current thread available") fmt.Println("No current thread available")
return nil return nil
} }
if len(state.CurrentThread.File) == 0 { if len(state.CurrentThread.File) == 0 {
fmt.Printf("Stopped at: 0x%x\n", state.CurrentThread.PC) fmt.Printf("Stopped at: 0x%x\n", state.CurrentThread.PC)
fmt.Printf("\033[34m=>\033[0m no source available\n") fmt.Printf("\033[34m=>\033[0m no source available\n")
return nil return nil
} }
var fn *api.Function var fn *api.Function
if state.CurrentThread.Function != nil { if state.CurrentThread.Function != nil {
fn = state.CurrentThread.Function fn = state.CurrentThread.Function
@ -582,11 +564,9 @@ func printcontext(state *api.DebuggerState) error {
printStack(bpi.Stacktrace, "\t\t") printStack(bpi.Stacktrace, "\t\t")
} }
} }
if state.Breakpoint != nil && state.Breakpoint.Tracepoint { if state.Breakpoint != nil && state.Breakpoint.Tracepoint {
return nil return nil
} }
return printfile(state.CurrentThread.File, state.CurrentThread.Line, true) return printfile(state.CurrentThread.File, state.CurrentThread.Line, true)
} }
@ -598,7 +578,6 @@ func printfile(filename string, line int, showArrow bool) error {
defer file.Close() defer file.Close()
var context []string var context []string
buf := bufio.NewReader(file) buf := bufio.NewReader(file)
l := line l := line
for i := 1; i < l-5; i++ { for i := 1; i < l-5; i++ {