cli: extract improvements to vlib/cli, based on PR 5616 (without cmd/v2)

vlib/cli/flag.v

@@ -9,16 +9,15 @@ pub enum FlagType {
 
 pub struct Flag {
 pub mut:
-	flag FlagType
-	name string
-	abbrev string
+	flag        FlagType
+	name        string
+	abbrev      string
 	description string
-	global bool
-	required bool
-	value string
-
+	global      bool
+	required    bool
+	value       string
 mut:
-	found bool
+	found       bool
 }
 
 pub fn (flags []Flag) get_all_found() []Flag {
@@ -26,73 +25,101 @@ pub fn (flags []Flag) get_all_found() []Flag {
 }
 
 pub fn (flag Flag) get_bool() ?bool {
-	if flag.flag != .bool { return error('invalid flag type') }
+	if flag.flag != .bool {
+		return error('invalid flag type')
+	}
 	return flag.value == 'true'
 }
 
 pub fn (flags []Flag) get_bool(name string) ?bool {
-	flag := flags.get(name) or { return error(err) }
+	flag := flags.get(name) or {
+		return error(err)
+	}
 	return flag.get_bool()
 }
 
 pub fn (flags []Flag) get_bool_or(name string, or_value bool) bool {
-	value := flags.get_bool(name) or { return or_value }
+	value := flags.get_bool(name) or {
+		return or_value
+	}
 	return value
 }
 
 pub fn (flag Flag) get_int() ?int {
-	if flag.flag != .int { return error('invalid flag type') }
+	if flag.flag != .int {
+		return error('invalid flag type')
+	}
 	return flag.value.int()
 }
 
 pub fn (flags []Flag) get_int(name string) ?int {
-	flag := flags.get(name) or { return error(err) }
+	flag := flags.get(name) or {
+		return error(err)
+	}
 	return flag.get_int()
 }
 
 pub fn (flags []Flag) get_int_or(name string, or_value int) int {
-	value := flags.get_int(name) or { return or_value }
+	value := flags.get_int(name) or {
+		return or_value
+	}
 	return value
 }
 
 pub fn (flag Flag) get_float() ?f64 {
-	if flag.flag != .float { return error('invalid flag type') }
+	if flag.flag != .float {
+		return error('invalid flag type')
+	}
 	return flag.value.f64()
 }
 
 pub fn (flags []Flag) get_float(name string) ?f64 {
-	flag := flags.get(name) or { return error(err) }
+	flag := flags.get(name) or {
+		return error(err)
+	}
 	return flag.get_float()
 }
 
 pub fn (flags []Flag) get_float_or(name string, or_value f64) f64 {
-	value := flags.get_float(name) or { return or_value }
+	value := flags.get_float(name) or {
+		return or_value
+	}
 	return value
 }
 
 pub fn (flag Flag) get_string() ?string {
-	if flag.flag != .string { return error('invalid flag type') }
+	if flag.flag != .string {
+		return error('invalid flag type')
+	}
 	return flag.value
 }
 
 pub fn (flags []Flag) get_string(name string) ?string {
-	flag := flags.get(name) or { return error(err) }
+	flag := flags.get(name) or {
+		return error(err)
+	}
 	return flag.get_string()
 }
 
-pub fn (flags []Flag) get_string_or(name string, or_value string) string {
-	value := flags.get_string(name) or { return or_value }
+pub fn (flags []Flag) get_string_or(name, or_value string) string {
+	value := flags.get_string(name) or {
+		return or_value
+	}
 	return value
 }
 
 // parse flag value from arguments and return arguments with all consumed element removed
-fn (mut flag Flag) parse(args []string) ?[]string {
-	if flag.matches(args) {
+fn (mut flag Flag) parse(args []string, with_abbrev bool) ?[]string {
+	if flag.matches(args, with_abbrev) {
 		if flag.flag == .bool {
-			new_args := flag.parse_bool(args) or { return error(err) }
+			new_args := flag.parse_bool(args) or {
+				return error(err)
+			}
 			return new_args
 		} else {
-			new_args := flag.parse_raw(args) or { return error(err) }
+			new_args := flag.parse_raw(args) or {
+				return error(err)
+			}
 			return new_args
 		}
 	} else {
@@ -101,12 +128,16 @@ fn (mut flag Flag) parse(args []string) ?[]string {
 }
 
 // check if first arg matches flag
-fn (mut flag Flag) matches(args []string) bool {
-	return
-		(flag.name != '' && args[0] == '--${flag.name}') || 
-		(flag.name != '' && args[0].starts_with('--${flag.name}=')) ||
-		(flag.abbrev != '' && args[0] == '-${flag.abbrev}') || 
-		(flag.abbrev != '' && args[0].starts_with('-${flag.abbrev}='))
+fn (mut flag Flag) matches(args []string, with_abbrev bool) bool {
+	if with_abbrev {
+		return (flag.name != '' && args[0] == '--$flag.name') ||
+			(flag.name != '' && args[0].starts_with('--$flag.name=')) ||
+			(flag.abbrev != '' && args[0] == '-$flag.abbrev') ||
+			(flag.abbrev != '' && args[0].starts_with('-$flag.abbrev='))
+	} else {
+		return (flag.name != '' && args[0] == '-$flag.name') ||
+			(flag.name != '' && args[0].starts_with('-$flag.name='))
+	}
 }
 
 fn (mut flag Flag) parse_raw(args []string) ?[]string {
@@ -117,7 +148,7 @@ fn (mut flag Flag) parse_raw(args []string) ?[]string {
 		flag.value = args[1]
 		return args[2..]
 	}
-	return error('missing argument for ${flag.name}')
+	return error('missing argument for $flag.name')
 }
 
 fn (mut flag Flag) parse_bool(args []string) ?[]string {
@@ -140,7 +171,7 @@ fn (flags []Flag) get(name string) ?Flag {
 			return flag
 		}
 	}
-	return error('flag ${name} not found.')
+	return error('flag $name not found.')
 }
 
 fn (flags []Flag) contains(name string) bool {
@@ -153,7 +184,7 @@ fn (flags []Flag) contains(name string) bool {
 }
 
 fn (mut flags []Flag) sort() {
-	flags.sort_with_compare(fn(a &Flag, b &Flag) int {
+	flags.sort_with_compare(fn (a, b &Flag) int {
 		return compare_strings(&a.name, &b.name)
 	})
 }