mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-14 04:24:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes to CLI parsing

Browse Source
This commit is contained in:
Kovid Goyal
2022-09-23 17:17:32 +05:30
parent 79cfc1e70a
commit 04022ed363
3 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/cli/parse-args.go
View File

@@ -19,13 +19,16 @@ func (self *Command) parse_args(ctx *Context, args []string) error {
consume_arg := func() string { ans := args_to_parse[0]; args_to_parse = args_to_parse[1:]; return ans }
handle_option := func(opt_str string, has_val bool, opt_val string) error {
handle_option := func(opt_str string, has_val bool, opt_val string, val_not_allowed bool) error {
opt := self.FindOption(opt_str)
if opt == nil {
return &ParseError{Message: fmt.Sprintf("Unknown option: :yellow:`%s`", opt_str)}
}
opt.seen_option = opt_str
needs_arg := opt.needs_argument()
if needs_arg && val_not_allowed {
return &ParseError{Message: fmt.Sprintf("The option : :yellow:`%s` must be followed by a value not another option", opt_str)}
}
if has_val {
if !needs_arg {
return &ParseError{Message: fmt.Sprintf("The option: :yellow:`%s` does not take values", opt_str)}
@@ -59,10 +62,14 @@ func (self *Command) parse_args(ctx *Context, args []string) error {
opt_val = parts[1]
}
opt_str = parts[0]
handle_option(opt_str, has_val, opt_val)
err := handle_option(opt_str, has_val, opt_val, false)
if err != nil {
return err
}
} else {
for _, sl := range opt_str[1:] {
err := handle_option("-"+string(sl), false, "")
runes := []rune(opt_str[1:])
for i, sl := range runes {
err := handle_option("-"+string(sl), false, "", i < len(runes)-1)
if err != nil {
return err
}