jcarr
/
go-arg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename get/settable to readable/writable

This commit is contained in:
Alex Flint 2019-04-30 11:40:11 -07:00
parent 7df132abe8
commit ddec9e9e4f
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
parse.go
View File

@ -346,7 +346,7 @@ func (p *Parser) process(specs []*spec, args []string) error {
err, err,
) )
} }
if err = setSlice(p.settable(spec), values, !spec.separate); err != nil { if err = setSlice(p.writable(spec), values, !spec.separate); err != nil {
return fmt.Errorf( return fmt.Errorf(
"error processing environment variable %s with multiple values: %v", "error processing environment variable %s with multiple values: %v",
spec.env, spec.env,
@ -354,7 +354,7 @@ func (p *Parser) process(specs []*spec, args []string) error {
) )
} }
} else { } else {
if err := scalar.ParseValue(p.settable(spec), value); err != nil { if err := scalar.ParseValue(p.writable(spec), value); err != nil {
return fmt.Errorf("error processing environment variable %s: %v", spec.env, err) return fmt.Errorf("error processing environment variable %s: %v", spec.env, err)
} }
} }
@ -407,7 +407,7 @@ func (p *Parser) process(specs []*spec, args []string) error {
} else { } else {
values = append(values, value) values = append(values, value)
} }
err := setSlice(p.settable(spec), values, !spec.separate) err := setSlice(p.writable(spec), values, !spec.separate)
if err != nil { if err != nil {
return fmt.Errorf("error processing %s: %v", arg, err) return fmt.Errorf("error processing %s: %v", arg, err)
} }
@ -432,7 +432,7 @@ func (p *Parser) process(specs []*spec, args []string) error {
i++ i++
} }
err := scalar.ParseValue(p.settable(spec), value) err := scalar.ParseValue(p.writable(spec), value)
if err != nil { if err != nil {
return fmt.Errorf("error processing %s: %v", arg, err) return fmt.Errorf("error processing %s: %v", arg, err)
} }
@ -448,13 +448,13 @@ func (p *Parser) process(specs []*spec, args []string) error {
} }
wasPresent[spec] = true wasPresent[spec] = true
if spec.multiple { if spec.multiple {
err := setSlice(p.settable(spec), positionals, true) err := setSlice(p.writable(spec), positionals, true)
if err != nil { if err != nil {
return fmt.Errorf("error processing %s: %v", spec.long, err) return fmt.Errorf("error processing %s: %v", spec.long, err)
} }
positionals = nil positionals = nil
} else { } else {
err := scalar.ParseValue(p.settable(spec), positionals[0]) err := scalar.ParseValue(p.writable(spec), positionals[0])
if err != nil { if err != nil {
return fmt.Errorf("error processing %s: %v", spec.long, err) return fmt.Errorf("error processing %s: %v", spec.long, err)
} }
@ -497,7 +497,9 @@ func isFlag(s string) bool {
return strings.HasPrefix(s, "-") && strings.TrimLeft(s, "-") != "" return strings.HasPrefix(s, "-") && strings.TrimLeft(s, "-") != ""
} }
func (p *Parser) get(spec *spec) reflect.Value { // readable returns a reflect.Value corresponding to the current value for the
// given
func (p *Parser) readable(spec *spec) reflect.Value {
v := p.roots[spec.root] v := p.roots[spec.root]
for _, field := range spec.path { for _, field := range spec.path {
if v.Kind() == reflect.Ptr { if v.Kind() == reflect.Ptr {
@ -509,6 +511,9 @@ func (p *Parser) get(spec *spec) reflect.Value {
v = v.FieldByName(field) v = v.FieldByName(field)
if !v.IsValid() { if !v.IsValid() {
// it is appropriate to panic here because this can only happen due to
// an internal bug in this library (since we construct spec.path ourselves
// by reflecting on the same struct)
panic(fmt.Errorf("error resolving path %v: %v has no field named %v", panic(fmt.Errorf("error resolving path %v: %v has no field named %v",
spec.path, v.Type(), field)) spec.path, v.Type(), field))
} }
@ -516,7 +521,10 @@ func (p *Parser) get(spec *spec) reflect.Value {
return v return v
} }
func (p *Parser) settable(spec *spec) reflect.Value { // writable traverses the destination struct to find the destination to
// which the value of the given spec should be written. It fills in null
// structs with pointers to the zero value for that struct.
func (p *Parser) writable(spec *spec) reflect.Value {
v := p.roots[spec.root] v := p.roots[spec.root]
for _, field := range spec.path { for _, field := range spec.path {
if v.Kind() == reflect.Ptr { if v.Kind() == reflect.Ptr {
@ -528,6 +536,9 @@ func (p *Parser) settable(spec *spec) reflect.Value {
v = v.FieldByName(field) v = v.FieldByName(field)
if !v.IsValid() { if !v.IsValid() {
// it is appropriate to panic here because this can only happen due to
// an internal bug in this library (since we construct spec.path ourselves
// by reflecting on the same struct)
panic(fmt.Errorf("error resolving path %v: %v has no field named %v", panic(fmt.Errorf("error resolving path %v: %v has no field named %v",
spec.path, v.Type(), field)) spec.path, v.Type(), field))
} }

2
usage.go
View File

@ -144,7 +144,7 @@ func (p *Parser) printOption(w io.Writer, spec *spec) {
// If spec.dest is not the zero value then a default value has been added. // If spec.dest is not the zero value then a default value has been added.
var v reflect.Value var v reflect.Value
if spec.root >= 0 { if spec.root >= 0 {
v = p.get(spec) v = p.readable(spec)
} }
if v.IsValid() { if v.IsValid() {
z := reflect.Zero(v.Type()) z := reflect.Zero(v.Type())