lib
/
cmd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename TakesArg to RequiresVal

This commit is contained in:
Evan Fiordeliso 2023-11-12 17:07:38 -05:00
parent b8a7d72433
commit 753c179edb
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opts/bool.go
View File

@ -54,8 +54,8 @@ func (o *BoolOption) Parse(raw string) error {
return nil return nil
} }
// TakesArg implements Option. // RequiresVal implements Option.
func (*BoolOption) TakesArg() bool { func (*BoolOption) RequiresVal() bool {
return false return false
} }

4
opts/float.go
View File

@ -51,8 +51,8 @@ func (o *FloatOption) Parse(raw string) error {
return nil return nil
} }
// TakesArg implements Option. // RequiresVal implements Option.
func (*FloatOption) TakesArg() bool { func (*FloatOption) RequiresVal() bool {
return true return true
} }

4
opts/int.go
View File

@ -51,8 +51,8 @@ func (o *IntOption) Parse(raw string) error {
return nil return nil
} }
// TakesArg implements Option. // RequiresVal implements Option.
func (*IntOption) TakesArg() bool { func (*IntOption) RequiresVal() bool {
return true return true
} }

2
opts/option.go
View File

@ -7,7 +7,7 @@ type Option interface {
ShortName() string ShortName() string
Description() string Description() string
Parse(raw string) error Parse(raw string) error
TakesArg() bool RequiresVal() bool
} }
func Names(o Option) string { func Names(o Option) string {

6
opts/parser.go
View File

@ -109,7 +109,7 @@ func (p *Parser) parseLongOption(longName string) error {
return nil // Ignore unknown option. Continue parsing. return nil // Ignore unknown option. Continue parsing.
} }
if value == "" && opt.TakesArg() { if value == "" && opt.RequiresVal() {
var ok bool var ok bool
value, ok = p.value() value, ok = p.value()
if !ok { if !ok {
@ -137,7 +137,7 @@ func (p *Parser) parseShortOption(shortNames string) error {
return nil // Ignore unknown option. Continue parsing. return nil // Ignore unknown option. Continue parsing.
} }
if !valOk && opt.TakesArg() { if !valOk && opt.RequiresVal() {
return fmt.Errorf("%w: %s", ErrOptionRequiresValue, "-"+shortNames) return fmt.Errorf("%w: %s", ErrOptionRequiresValue, "-"+shortNames)
} }
@ -158,7 +158,7 @@ func (p *Parser) parseShortOption(shortNames string) error {
continue // Ignore unknown option. Continue parsing. continue // Ignore unknown option. Continue parsing.
} }
if opt.TakesArg() { if opt.RequiresVal() {
if j > 0 { if j > 0 {
return fmt.Errorf("%w: %s", ErrCannotChainOption, "-"+string(shortName)) return fmt.Errorf("%w: %s", ErrCannotChainOption, "-"+string(shortName))
} }

4
opts/string.go
View File

@ -43,8 +43,8 @@ func (o *StringOption) Parse(raw string) error {
return nil return nil
} }
// TakesArg implements Option. // RequiresVal implements Option.
func (*StringOption) TakesArg() bool { func (*StringOption) RequiresVal() bool {
return true return true
} }