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

all: automatic error propagation in place of "or { return(err) }"

Browse Source
This commit is contained in:
Maciej Obarski
2020-08-29 01:58:03 +02:00
committed by GitHub
parent 4d425b0e6d
commit 7bd2804ce9
23 changed files with 79 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
vlib/cli/flag.v
View File

@ -32,9 +32,7 @@ pub fn (flag Flag) get_bool() ?bool {
}
pub fn (flags []Flag) get_bool(name string) ?bool {
flag := flags.get(name) or {
return error(err)
}
flag := flags.get(name)?
return flag.get_bool()
}
@ -53,9 +51,7 @@ pub fn (flag Flag) get_int() ?int {
}
pub fn (flags []Flag) get_int(name string) ?int {
flag := flags.get(name) or {
return error(err)
}
flag := flags.get(name)?
return flag.get_int()
}
@ -74,9 +70,7 @@ pub fn (flag Flag) get_float() ?f64 {
}
pub fn (flags []Flag) get_float(name string) ?f64 {
flag := flags.get(name) or {
return error(err)
}
flag := flags.get(name)?
return flag.get_float()
}
@ -95,9 +89,7 @@ pub fn (flag Flag) get_string() ?string {
}
pub fn (flags []Flag) get_string(name string) ?string {
flag := flags.get(name) or {
return error(err)
}
flag := flags.get(name)?
return flag.get_string()
}
@ -112,14 +104,10 @@ pub fn (flags []Flag) get_string_or(name, or_value string) string {
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)?
return new_args
} else {
new_args := flag.parse_raw(args) or {
return error(err)
}
new_args := flag.parse_raw(args)?
return new_args
}
} else {