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

Merge pull request #80 from alexflint/simplify-positionals 

Simplify handling of positionals a little
This commit is contained in:
Alex Flint 2019-04-14 18:00:17 -07:00 committed by GitHub
parent 42c2ab5ac6 7b1d9ef23f
commit 78d30a555c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
parse.go
View File

@ -383,11 +383,13 @@ func process(specs []*spec, args []string) error {
// process positionals // process positionals
for _, spec := range specs { for _, spec := range specs {
if spec.positional { if !spec.positional {
if spec.multiple { continue
}
if spec.required && len(positionals) == 0 { if spec.required && len(positionals) == 0 {
return fmt.Errorf("%s is required", spec.long) return fmt.Errorf("%s is required", spec.long)
} }
if spec.multiple {
err := setSlice(spec.dest, positionals, true) err := setSlice(spec.dest, 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)
@ -399,9 +401,6 @@ func process(specs []*spec, args []string) error {
return fmt.Errorf("error processing %s: %v", spec.long, err) return fmt.Errorf("error processing %s: %v", spec.long, err)
} }
positionals = positionals[1:] positionals = positionals[1:]
} else if spec.required {
return fmt.Errorf("%s is required", spec.long)
}
} }
} }
if len(positionals) > 0 { if len(positionals) > 0 {