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

pkg/terminal: use reflect.Value.IsValid to check a zero Value (#3450)

Browse Source 
I searched the source code of Go, and found no usages of
"== (reflect.Value{})" and "!= (reflect.Value{})". I think
it's more idiomatic to use "IsValid" to check a zero Value.
This commit is contained in:
gocurr 2023-08-01 23:35:59 +08:00 committed by GitHub
parent 7db57df266
commit b5c9edccff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/terminal/colorize/colorize.go
View File

@ -134,13 +134,13 @@ func Print(out io.Writer, path string, reader io.Reader, startLine, endLine, arr
tokposval := nval.FieldByName("TokPos") tokposval := nval.FieldByName("TokPos")
tokval := nval.FieldByName("Tok") tokval := nval.FieldByName("Tok")
if tokposval != (reflect.Value{}) && tokval != (reflect.Value{}) { if tokposval.IsValid() && tokval.IsValid() {
emit(tokval.Interface().(token.Token), tokposval.Interface().(token.Pos), token.NoPos) emit(tokval.Interface().(token.Token), tokposval.Interface().(token.Pos), token.NoPos)
} }
for _, kwname := range []string{"Case", "Begin", "Defer", "For", "Func", "Go", "Interface", "Map", "Return", "Select", "Struct", "Switch"} { for _, kwname := range []string{"Case", "Begin", "Defer", "For", "Func", "Go", "Interface", "Map", "Return", "Select", "Struct", "Switch"} {
kwposval := nval.FieldByName(kwname) kwposval := nval.FieldByName(kwname)
if kwposval != (reflect.Value{}) { if kwposval.IsValid() {
kwpos, ok := kwposval.Interface().(token.Pos) kwpos, ok := kwposval.Interface().(token.Pos)
if ok && kwpos != token.NoPos { if ok && kwpos != token.NoPos {
emit(token.ILLEGAL, kwpos, token.NoPos) emit(token.ILLEGAL, kwpos, token.NoPos)

4
pkg/terminal/starbind/conv.go
View File

@ -181,7 +181,7 @@ func (v structAsStarlarkValue) Attr(name string) (starlark.Value, error) {
return r, err return r, err
} }
r := v.v.FieldByName(name) r := v.v.FieldByName(name)
if r == (reflect.Value{}) { if !r.IsValid() {
return starlark.None, fmt.Errorf("no field named %q in %T", name, v.v.Interface()) return starlark.None, fmt.Errorf("no field named %q in %T", name, v.v.Interface())
} }
return v.env.interfaceToStarlarkValue(r.Interface()), nil return v.env.interfaceToStarlarkValue(r.Interface()), nil
@ -681,7 +681,7 @@ func unmarshalStarlarkValueIntl(val starlark.Value, dst reflect.Value, path stri
} }
fieldName := string(k.(starlark.String)) fieldName := string(k.(starlark.String))
dstfield := dst.FieldByName(fieldName) dstfield := dst.FieldByName(fieldName)
if dstfield == (reflect.Value{}) { if !dstfield.IsValid() {
return converr(fmt.Sprintf("unknown field %s", fieldName)) return converr(fmt.Sprintf("unknown field %s", fieldName))
} }
valfield, _, _ := val.Get(starlark.String(fieldName)) valfield, _, _ := val.Get(starlark.String(fieldName))