mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

fix the cli module

Browse Source
This commit is contained in:
Alexander Medvednikov 2019-11-30 12:44:40 +03:00
parent 7e4799334f
commit 1a0b78ae2f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/cli/flag.v
View File

@ -60,7 +60,7 @@ fn (flag mut Flag) parse(args []string) ?[]string {
// check if first arg matches flag // check if first arg matches flag
fn (flag mut Flag) matches(args []string) bool { fn (flag mut Flag) matches(args []string) bool {
return return
(flag.name != '' && args[0].starts_with('--${flag.name}')) || (flag.name != '' && args[0].starts_with('--${flag.name}')) ||
(flag.abbrev != '' && args[0].starts_with('-${flag.abbrev}')) (flag.abbrev != '' && args[0].starts_with('-${flag.abbrev}'))
} }
@ -69,10 +69,10 @@ fn (flag mut Flag) parse_raw(args []string) ?[]string {
if args[0].len > flag.name.len && args[0].contains('=') { if args[0].len > flag.name.len && args[0].contains('=') {
println('1') println('1')
flag.value = args[0].split('=')[1] flag.value = args[0].split('=')[1]
return args.right(1) return args[1..]
} else if args.len >= 2 { } else if args.len >= 2 {
flag.value = args[1] flag.value = args[1]
return args.right(2) return args[2..]
} }
return error('missing argument for ${flag.name}') return error('missing argument for ${flag.name}')
} }
@ -80,15 +80,15 @@ fn (flag mut Flag) parse_raw(args []string) ?[]string {
fn (flag mut Flag) parse_bool(args []string) ?[]string { fn (flag mut Flag) parse_bool(args []string) ?[]string {
if args[0].len > flag.name.len && args[0].contains('=') { if args[0].len > flag.name.len && args[0].contains('=') {
flag.value = args[0].split('=')[1] flag.value = args[0].split('=')[1]
return args.right(1) return args[1..]
} else if args.len >= 2 { } else if args.len >= 2 {
if args[1] in ['true', 'false'] { if args[1] in ['true', 'false'] {
flag.value = args[1] flag.value = args[1]
return args.right(2) return args[2..]
} }
} }
flag.value = 'true' flag.value = 'true'
return args.right(1) return args[1..]
} }
fn (flags []Flag) get(name string) ?Flag { fn (flags []Flag) get(name string) ?Flag {