Archives/bonzai
2
0
Fork 0
mirror of https://github.com/rwxrob/bonzai synced 2024-11-14 18:12:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add MaxArgs, NumArgs, clean up returns

Browse Source
This commit is contained in:
rwxrob 2022-04-14 07:51:13 -04:00
parent 7a319fdcc2
commit 1abb85778c
No known key found for this signature in database
GPG Key ID: 2B9111F33082AE77
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
z/cmd.go
View File

@ -55,6 +55,8 @@ type Cmd struct {
// faster than lots of "if" in Call // faster than lots of "if" in Call
MinArgs int `json:"-"` // minimum number of args required (including parms) MinArgs int `json:"-"` // minimum number of args required (including parms)
MaxArgs int `json:"-"` // maximum number of args required (including parms)
NumArgs int `json:"-"` // exact number of args required (including parms)
MinParm int `json:"-"` // minimum number of params required MinParm int `json:"-"` // minimum number of params required
MaxParm int `json:"-"` // maximum number of params required MaxParm int `json:"-"` // maximum number of params required
ReqConf bool `json:"-"` // requires Z.Conf be assigned ReqConf bool `json:"-"` // requires Z.Conf be assigned
@ -190,8 +192,11 @@ func (x *Cmd) cacheSections() {
// Exiting can be controlled, however, by calling ExitOn or ExitOff // Exiting can be controlled, however, by calling ExitOn or ExitOff
// (primarily for testing). Use Call instead of Run when delegation is // (primarily for testing). Use Call instead of Run when delegation is
// needed. However, avoid tight-coupling that comes from delegation with // needed. However, avoid tight-coupling that comes from delegation with
// Call when possible. Use a high-level branch pkg instead (which is // Call when possible. Also, Call automatically assumes the proper
// idiomatic for good Bonzai branch development). // number and type of arguments have already been checked (see MinArgs,
// MaxArgs, NumArgs, etc.) which is normally done by Run. Use
// a high-level branch pkg instead (which is idiomatic for good Bonzai
// branch development).
// //
// Handling Completion // Handling Completion
// //
@ -232,6 +237,9 @@ func (x *Cmd) cacheSections() {
func (x *Cmd) Run() { func (x *Cmd) Run() {
defer TrapPanic() defer TrapPanic()
// returns throughout are because Exit* can be disabled
// see ExitOff/On
x.cacheSections() x.cacheSections()
// resolve Z.Aliases (if completion didn't replace them) // resolve Z.Aliases (if completion didn't replace them)
@ -245,7 +253,7 @@ func (x *Cmd) Run() {
} }
} }
// completion mode // COMPLETION
line := os.Getenv("COMP_LINE") line := os.Getenv("COMP_LINE")
if line != "" { if line != "" {
@ -267,24 +275,28 @@ func (x *Cmd) Run() {
if v, has := Aliases[list[0]]; has { if v, has := Aliases[list[0]]; has {
fmt.Println(strings.Join(EscAll(v), " ")) fmt.Println(strings.Join(EscAll(v), " "))
Exit() Exit()
return
} }
} }
each.Println(list) each.Println(list)
Exit() Exit()
return
} }
// own completer, delegate // own completer, delegate
each.Println(cmd.Comp.Complete(cmd, args...)) each.Println(cmd.Comp.Complete(cmd, args...))
Exit() Exit()
return
} }
// delegation mode // DELEGATION
// seek should never fail to return something, but ... // seek should never fail to return something, but ...
cmd, args := x.Seek(os.Args[1:]) cmd, args := x.Seek(os.Args[1:])
if cmd == nil { if cmd == nil {
ExitError(x.UsageError()) ExitError(IncorrectUsage{cmd})
return
} }
// default to first Command if no Call defined // default to first Command if no Call defined
@ -322,6 +334,7 @@ func (x *Cmd) Run() {
} }
if err := cmd.Call(cmd, args...); err != nil { if err := cmd.Call(cmd, args...); err != nil {
ExitError(err) ExitError(err)
return
} }
Exit() Exit()
} }