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

flag: fix flag_test.v

Browse Source
This commit is contained in:
yuyi 2020-04-21 19:44:17 +08:00 committed by GitHub
parent a8dc0ccbcd
commit bc4a576c54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/tools/vtest-fixed.v
View File

@ -11,7 +11,6 @@ const (
'vlib/crypto/rc4/rc4_test.v', 'vlib/crypto/rc4/rc4_test.v',
'vlib/encoding/utf8/utf8_util_test.v', 'vlib/encoding/utf8/utf8_util_test.v',
'vlib/eventbus/eventbus_test.v', 'vlib/eventbus/eventbus_test.v',
'vlib/flag/flag_test.v',
'vlib/json/json_test.v', 'vlib/json/json_test.v',
'vlib/net/ftp/ftp_test.v', 'vlib/net/ftp/ftp_test.v',
'vlib/net/http/http_httpbin_test.v', 'vlib/net/http/http_httpbin_test.v',

12
vlib/flag/flag.v
View File

@ -291,25 +291,25 @@ pub fn (fs mut FlagParser) int(name string, abbr byte, idefault int, usage strin
// float_multi returns all instances of values associated with the flags provided // float_multi returns all instances of values associated with the flags provided
// In the case that none were found, it returns an empty array. // In the case that none were found, it returns an empty array.
pub fn (fs mut FlagParser) float_multi(name string, abbr byte, usage string) []f32 { pub fn (fs mut FlagParser) float_multi(name string, abbr byte, usage string) []f64 {
fs.add_flag(name, abbr, usage, '<multiple floats>') fs.add_flag(name, abbr, usage, '<multiple floats>')
parsed := fs.parse_value(name, abbr) parsed := fs.parse_value(name, abbr)
mut value := []f32 mut value := []f64
for val in parsed { for val in parsed {
value << val.f32() value << val.f64()
} }
return value return value
} }
// float_opt returns an optional that returns the value associated with the flag. // float_opt returns an optional that returns the value associated with the flag.
// In the situation that the flag was not provided, it returns null. // In the situation that the flag was not provided, it returns null.
pub fn (fs mut FlagParser) float_opt(name string, abbr byte, usage string) ?f32 { pub fn (fs mut FlagParser) float_opt(name string, abbr byte, usage string) ?f64 {
fs.add_flag(name, abbr, usage, '<float>') fs.add_flag(name, abbr, usage, '<float>')
parsed := fs.parse_value(name, abbr) parsed := fs.parse_value(name, abbr)
if parsed.len == 0 { if parsed.len == 0 {
return error("parameter '$name' not provided") return error("parameter '$name' not provided")
} }
return parsed[0].f32() return parsed[0].f64()
} }
// defining and parsing a float flag // defining and parsing a float flag
@ -319,7 +319,7 @@ pub fn (fs mut FlagParser) float_opt(name string, abbr byte, usage string) ?f32
// the default value is returned // the default value is returned
// version with abbr // version with abbr
//TODO error handling for invalid string to float conversion //TODO error handling for invalid string to float conversion
pub fn (fs mut FlagParser) float(name string, abbr byte, fdefault f32, usage string) f32 { pub fn (fs mut FlagParser) float(name string, abbr byte, fdefault f64, usage string) f64 {
value := fs.float_opt(name, abbr, usage) or { value := fs.float_opt(name, abbr, usage) or {
return fdefault return fdefault
} }

3
vlib/flag/flag_test.v
View File

@ -276,8 +276,11 @@ fn test_not_provided_option_is_not_returned() {
//Everything should not return //Everything should not return
return return
} }
return
} }
return
} }
return
} }
//If we reach here, one of them returned a value. //If we reach here, one of them returned a value.
assert false assert false