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

vfmt: change all '$expr' to '${expr}' (#16428)

Browse Source
This commit is contained in:
yuyi
2022-11-15 21:53:13 +08:00
committed by GitHub
parent 56239b4a23
commit 017ace6ea7
859 changed files with 7156 additions and 7135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
vlib/cli/flag.v
View File

@@ -44,7 +44,7 @@ pub fn (flags []Flag) get_all_found() []Flag {
// get_bool returns an error if the `FlagType` is not boolean.
pub fn (flag Flag) get_bool() !bool {
if flag.flag != .bool {
return error('$flag.name: Invalid flag type `$flag.flag`, expected `bool`')
return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `bool`')
}
val := flag.get_value_or_default_value()
@@ -63,7 +63,7 @@ pub fn (flags []Flag) get_bool(name string) !bool {
// get_int returns an error if the `FlagType` is not integer.
pub fn (flag Flag) get_int() !int {
if flag.flag != .int {
return error('$flag.name: Invalid flag type `$flag.flag`, expected `int`')
return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `int`')
}
val := flag.get_value_or_default_value()
@@ -79,7 +79,7 @@ pub fn (flag Flag) get_int() !int {
// get_ints returns an error if the `FlagType` is not integer.
pub fn (flag Flag) get_ints() ![]int {
if flag.flag != .int_array {
return error('$flag.name: Invalid flag type `$flag.flag`, expected `int_array`')
return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `int_array`')
}
val := flag.get_value_or_default_value()
@@ -115,7 +115,7 @@ pub fn (flags []Flag) get_ints(name string) ![]int {
// get_float returns an error if the `FlagType` is not floating point.
pub fn (flag Flag) get_float() !f64 {
if flag.flag != .float {
return error('$flag.name: Invalid flag type `$flag.flag`, expected `float`')
return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `float`')
}
val := flag.get_value_or_default_value()
@@ -131,7 +131,7 @@ pub fn (flag Flag) get_float() !f64 {
// get_floats returns an error if the `FlagType` is not floating point.
pub fn (flag Flag) get_floats() ![]f64 {
if flag.flag != .float_array {
return error('$flag.name: Invalid flag type `$flag.flag`, expected `float_array`')
return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `float_array`')
}
val := flag.get_value_or_default_value()
@@ -167,7 +167,7 @@ pub fn (flags []Flag) get_floats(name string) ![]f64 {
// get_string returns an error if the `FlagType` is not string.
pub fn (flag Flag) get_string() !string {
if flag.flag != .string {
return error('$flag.name: Invalid flag type `$flag.flag`, expected `string`')
return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `string`')
}
val := flag.get_value_or_default_value()
@@ -183,7 +183,7 @@ pub fn (flag Flag) get_string() !string {
// get_strings returns an error if the `FlagType` is not string.
pub fn (flag Flag) get_strings() ![]string {
if flag.flag != .string_array {
return error('$flag.name: Invalid flag type `$flag.flag`, expected `string_array`')
return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `string_array`')
}
val := flag.get_value_or_default_value()
@@ -219,7 +219,7 @@ fn (mut flag Flag) parse(args []string, posix_mode bool) ![]string {
} else {
if flag.value.len > 0 && flag.flag != .int_array && flag.flag != .float_array
&& flag.flag != .string_array {
return error('The argument `$flag.name` accept only one value!')
return error('The argument `${flag.name}` accept only one value!')
}
new_args := flag.parse_raw(args)!
@@ -233,10 +233,10 @@ fn (mut flag Flag) parse(args []string, posix_mode bool) ![]string {
// matches returns `true` if first arg in `args` matches this flag.
fn (mut flag Flag) matches(args []string, posix_mode bool) bool {
prefix := if posix_mode { '--' } else { '-' }
return (flag.name != '' && args[0] == '$prefix$flag.name')
|| (flag.name != '' && args[0].starts_with('$prefix$flag.name='))
|| (flag.abbrev != '' && args[0] == '-$flag.abbrev')
|| (flag.abbrev != '' && args[0].starts_with('-$flag.abbrev='))
return (flag.name != '' && args[0] == '${prefix}${flag.name}')
|| (flag.name != '' && args[0].starts_with('${prefix}${flag.name}='))
|| (flag.abbrev != '' && args[0] == '-${flag.abbrev}')
|| (flag.abbrev != '' && args[0].starts_with('-${flag.abbrev}='))
}
fn (mut flag Flag) parse_raw(args []string) ![]string {
@@ -247,7 +247,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 {
@@ -273,7 +273,7 @@ fn (flags []Flag) get(name string) !Flag {
return flag
}
}
return error('Flag `$name` not found in $flags')
return error('Flag `${name}` not found in ${flags}')
}
fn (flags []Flag) contains(name string) bool {