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

2
vlib/flag/README.md
View File

@ -37,7 +37,7 @@ fn main() {
println(fp.usage())
return
}
println('an_int: $an_int | a_bool: $a_bool | a_float: $a_float | a_string: "$a_string" ')
println('an_int: ${an_int} | a_bool: ${a_bool} | a_float: ${a_float} | a_string: "${a_string}" ')
println(additional_args.join_lines())
}
```

2
vlib/flag/default_flag_options_test.v
View File

@ -19,7 +19,7 @@ fn testsuite_end() {
fn check_program(opts string, extension string) {
result := source.replace('.v', extension)
res := os.execute('${os.quoted_path(simple_flag_app_executable)} $opts')
res := os.execute('${os.quoted_path(simple_flag_app_executable)} ${opts}')
lines := os.read_lines(result) or { panic(err) }
assert res.exit_code == 0
assert res.output.split_into_lines() == lines

72
vlib/flag/flag.v
View File

@ -16,7 +16,7 @@ struct UnkownFlagError {
}
fn (err UnkownFlagError) msg() string {
return 'Unknown flag `$err.flag`'
return 'Unknown flag `${err.flag}`'
}
struct ArgsCountError {
@ -27,11 +27,11 @@ struct ArgsCountError {
fn (err ArgsCountError) msg() string {
if err.want == 0 {
return 'Expected no arguments, but got $err.got'
return 'Expected no arguments, but got ${err.got}'
} else if err.got > err.want {
return 'Expected at most $err.want arguments, but got $err.got'
return 'Expected at most ${err.want} arguments, but got ${err.got}'
} else {
return 'Expected at least $err.want arguments, but got $err.got'
return 'Expected at least ${err.want} arguments, but got ${err.got}'
}
}
@ -51,9 +51,9 @@ fn (mut f Flag) free() {
// str returns a string representation of the given Flag
pub fn (f Flag) str() string {
return '' + ' flag:\n' + ' name: $f.name\n' +
' abbr: `$f.abbr.ascii_str()`\n' + ' usag: $f.usage\n' +
' desc: $f.val_desc'
return '' + ' flag:\n' + ' name: ${f.name}\n' +
' abbr: `${f.abbr.ascii_str()}`\n' + ' usag: ${f.usage}\n' +
' desc: ${f.val_desc}'
}
// str returns a string representation of the given array of Flags
@ -181,7 +181,7 @@ pub fn (mut fs FlagParser) description(desc string) {
if fs.application_description.len == 0 {
fs.application_description = desc
} else {
fs.application_description += '\n$desc'
fs.application_description += '\n${desc}'
}
}
@ -220,7 +220,7 @@ fn (mut fs FlagParser) add_flag(name string, abbr u8, usage string, desc string)
// - found arguments and corresponding values are removed from args list
[manualfree]
fn (mut fs FlagParser) parse_value(longhand string, shorthand u8) []string {
full := '--$longhand'
full := '--${longhand}'
defer {
unsafe { full.free() }
}
@ -259,7 +259,7 @@ fn (mut fs FlagParser) parse_value(longhand string, shorthand u8) []string {
should_skip_one = true
continue
}
if arg.len > full.len + 1 && arg[..full.len + 1] == '$full=' {
if arg.len > full.len + 1 && arg[..full.len + 1] == '${full}=' {
found_entries << arg[full.len + 1..]
to_delete << i
continue
@ -280,7 +280,7 @@ fn (mut fs FlagParser) parse_value(longhand string, shorthand u8) []string {
// -> '--flag' is equal to '--flag=true'
fn (mut fs FlagParser) parse_bool_value(longhand string, shorthand u8) !string {
{
full := '--$longhand'
full := '--${longhand}'
for i, arg in fs.args {
if arg.len == 0 {
continue
@ -299,7 +299,7 @@ fn (mut fs FlagParser) parse_bool_value(longhand string, shorthand u8) !string {
return 'true'
}
}
if arg.len > full.len + 1 && arg[..full.len + 1] == '$full=' {
if arg.len > full.len + 1 && arg[..full.len + 1] == '${full}=' {
// Flag abc=true
val := arg[full.len + 1..]
fs.args.delete(i)
@ -311,7 +311,7 @@ fn (mut fs FlagParser) parse_bool_value(longhand string, shorthand u8) !string {
}
}
}
return error("parameter '$longhand' not found")
return error("parameter '${longhand}' not found")
}
// bool_opt returns an option with the bool value of the given command line flag, named `name`.
@ -322,7 +322,7 @@ pub fn (mut fs FlagParser) bool_opt(name string, abbr u8, usage string) !bool {
{
fs.add_flag(name, abbr, usage, '<bool>')
parsed := fs.parse_bool_value(name, abbr) or {
return error("parameter '$name' not provided")
return error("parameter '${name}' not provided")
}
res = parsed == 'true'
}
@ -360,7 +360,7 @@ pub fn (mut fs FlagParser) int_opt(name string, abbr u8, usage string) !int {
fs.add_flag(name, abbr, usage, '<int>')
parsed := fs.parse_value(name, abbr)
if parsed.len == 0 {
return error("parameter '$name' not provided")
return error("parameter '${name}' not provided")
}
parsed0 := parsed[0]
res = parsed0.int()
@ -399,7 +399,7 @@ pub fn (mut fs FlagParser) float_opt(name string, abbr u8, usage string) !f64 {
fs.add_flag(name, abbr, usage, '<float>')
parsed := fs.parse_value(name, abbr)
if parsed.len == 0 {
return error("parameter '$name' not provided")
return error("parameter '${name}' not provided")
}
res = parsed[0].f64()
}
@ -432,7 +432,7 @@ pub fn (mut fs FlagParser) string_opt(name string, abbr u8, usage string) !strin
fs.add_flag(name, abbr, usage, '<string>')
parsed := fs.parse_value(name, abbr)
if parsed.len == 0 {
return error("parameter '$name' not provided")
return error("parameter '${name}' not provided")
}
res = parsed[0]
}
@ -453,7 +453,7 @@ pub fn (mut fs FlagParser) string(name string, abbr u8, sdefault string, usage s
// the parser will return an error.
pub fn (mut fs FlagParser) limit_free_args_to_at_least(n int) ! {
if n > flag.max_args_number {
return error('flag.limit_free_args_to_at_least expect n to be smaller than $flag.max_args_number')
return error('flag.limit_free_args_to_at_least expect n to be smaller than ${flag.max_args_number}')
}
if n <= 0 {
return error('flag.limit_free_args_to_at_least expect n to be a positive number')
@ -466,7 +466,7 @@ pub fn (mut fs FlagParser) limit_free_args_to_at_least(n int) ! {
// the parser will return an error.
pub fn (mut fs FlagParser) limit_free_args_to_exactly(n int) ! {
if n > flag.max_args_number {
return error('flag.limit_free_args_to_exactly expect n to be smaller than $flag.max_args_number')
return error('flag.limit_free_args_to_exactly expect n to be smaller than ${flag.max_args_number}')
}
if n < 0 {
return error('flag.limit_free_args_to_exactly expect n to be a non negative number')
@ -480,7 +480,7 @@ pub fn (mut fs FlagParser) limit_free_args_to_exactly(n int) ! {
// the parser will return an error.
pub fn (mut fs FlagParser) limit_free_args(min int, max int) ! {
if min > max {
return error('flag.limit_free_args expect min < max, got $min >= $max')
return error('flag.limit_free_args expect min < max, got ${min} >= ${max}')
}
fs.min_free_args = min
fs.max_free_args = max
@ -505,23 +505,23 @@ pub fn (fs FlagParser) usage() string {
}
mut use := []string{}
if fs.application_version != '' {
use << '$fs.application_name $fs.application_version'
use << '$flag.underline'
use << '${fs.application_name} ${fs.application_version}'
use << '${flag.underline}'
}
if fs.usage_examples.len == 0 {
use << 'Usage: $fs.application_name [options] $adesc'
use << 'Usage: ${fs.application_name} [options] ${adesc}'
} else {
for i, example in fs.usage_examples {
if i == 0 {
use << 'Usage: $fs.application_name $example'
use << 'Usage: ${fs.application_name} ${example}'
} else {
use << ' or: $fs.application_name $example'
use << ' or: ${fs.application_name} ${example}'
}
}
}
use << ''
if fs.application_description != '' {
use << 'Description: $fs.application_description'
use << 'Description: ${fs.application_description}'
use << ''
}
// show a message about the [ARGS]:
@ -532,16 +532,16 @@ pub fn (fs FlagParser) usage() string {
} else {
mut s := []string{}
if positive_min_arg {
s << 'at least $fs.min_free_args'
s << 'at least ${fs.min_free_args}'
}
if positive_max_arg {
s << 'at most $fs.max_free_args'
s << 'at most ${fs.max_free_args}'
}
if positive_min_arg && positive_max_arg && fs.min_free_args == fs.max_free_args {
s = ['exactly $fs.min_free_args']
s = ['exactly ${fs.min_free_args}']
}
sargs := s.join(' and ')
use << 'The arguments should be $sargs in number.'
use << 'The arguments should be ${sargs} in number.'
use << ''
}
}
@ -550,23 +550,23 @@ pub fn (fs FlagParser) usage() string {
for f in fs.flags {
mut onames := []string{}
if f.abbr != 0 {
onames << '-$f.abbr.ascii_str()'
onames << '-${f.abbr.ascii_str()}'
}
if f.name != '' {
if !f.val_desc.contains('<bool>') {
onames << '--$f.name $f.val_desc'
onames << '--${f.name} ${f.val_desc}'
} else {
onames << '--$f.name'
onames << '--${f.name}'
}
}
option_names := ' ' + onames.join(', ')
mut xspace := ''
if option_names.len > flag.space.len - 2 {
xspace = '\n$flag.space'
xspace = '\n${flag.space}'
} else {
xspace = flag.space[option_names.len..]
}
fdesc := '$option_names$xspace$f.usage'
fdesc := '${option_names}${xspace}${f.usage}'
use << fdesc
}
}
@ -604,7 +604,7 @@ fn (mut fs FlagParser) handle_builtin_options() {
exit(0)
}
if show_version {
println('$fs.application_name $fs.application_version')
println('${fs.application_name} ${fs.application_version}')
exit(0)
}
}

2
vlib/flag/flag_test.v
View File

@ -172,7 +172,7 @@ fn test_allow_to_build_usage_message() {
'The arguments should be at least 1 and at most 4 in number.', 'Usage', 'Options:',
'Description:', 'some short information about this tool'] {
if !usage.contains(s) {
eprintln(" missing '$s' in usage message")
eprintln(" missing '${s}' in usage message")
all_strings_found = false
}
}

2
vlib/flag/usage_example_test.v
View File

@ -21,7 +21,7 @@ fn normalise_lines(lines []string) string {
fn check_program(opts string, extension string) {
result := the_source.replace('.v', extension)
res := os.execute('${os.quoted_path(the_executable)} $opts')
res := os.execute('${os.quoted_path(the_executable)} ${opts}')
assert res.exit_code == 0
assert normalise_lines(res.output.split_into_lines()) == normalise_lines(os.read_lines(result) or {
panic(err)