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

proc: Format & refactor

Browse Source
This commit is contained in:
Derek Parker 2015-10-06 18:21:28 -07:00
parent a8512ba11a
commit 56d57ee97a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
proc/variables.go
View File

@ -125,18 +125,19 @@ func newVariable(name string, addr uintptr, dwarfType dwarf.Type, thread *Thread
} }
func (v *Variable) toField(field *dwarf.StructField) (*Variable, error) { func (v *Variable) toField(field *dwarf.StructField) (*Variable, error) {
if v.Addr == 0 {
return nil, fmt.Errorf("%s is nil", v.Name)
}
name := "" name := ""
if v.Name != "" { if v.Name != "" {
parts := strings.Split(field.Name, ".") parts := strings.Split(field.Name, ".")
if len(parts) > 1 { if len(parts) > 1 {
name = fmt.Sprintf("%s.%s", v.Name, parts[1]) name = fmt.Sprintf("%s.%s", v.Name, parts[1])
} else { } else {
name = fmt.Sprintf("%s.%s", v.Name, field.Name) name = fmt.Sprintf("%s.%s", v.Name, field.Name)
} }
} }
if v.Addr == 0 {
return nil, fmt.Errorf("%s is nil", v.Name)
}
return newVariable(name, uintptr(int64(v.Addr)+field.ByteOffset), field.Type, v.thread) return newVariable(name, uintptr(int64(v.Addr)+field.ByteOffset), field.Type, v.thread)
} }
@ -470,9 +471,9 @@ func (v *Variable) structMember(memberName string) (*Variable, error) {
for _, field := range t.Field { for _, field := range t.Field {
isEmbeddedStructMember := isEmbeddedStructMember :=
(field.Type.String() == ("struct " + field.Name)) || (field.Type.String() == ("struct " + field.Name)) ||
(len(field.Name) > 1 && (len(field.Name) > 1 &&
field.Name[0] == '*' && field.Name[0] == '*' &&
field.Type.String()[1:] == ("struct " + field.Name[1:])) field.Type.String()[1:] == ("struct "+field.Name[1:]))
if !isEmbeddedStructMember { if !isEmbeddedStructMember {
continue continue
} }