Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-06-08 18:22:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #289 from mqudsi/optional_args

Browse Source 
Optional args support
This commit is contained in:
Benjamin Sago 2020-01-18 23:22:17 +00:00 committed by GitHub
commit 44664bf757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/options/parser.rs
View File

@ -101,6 +101,9 @@ pub enum TakesValue {
/// This flag will throw an error if there’s a value after it.
Forbidden,
/// This flag may be followed by a value to override its defaults
Optional(Option<Values>),
}
@ -180,8 +183,8 @@ impl Args {
let arg = self.lookup_long(before)?;
let flag = Flag::Long(arg.long);
match arg.takes_value {
Necessary(_) => result_flags.push((flag, Some(after))),
Forbidden => return Err(ParseError::ForbiddenValue { flag })
Necessary(_)|Optional(_) => result_flags.push((flag, Some(after))),
Forbidden => return Err(ParseError::ForbiddenValue { flag })
}
}
@ -199,6 +202,14 @@ impl Args {
else {
return Err(ParseError::NeedsValue { flag, values })
}
},
Optional(_) => {
if let Some(next_arg) = inputs.next() {
result_flags.push((flag, Some(next_arg)));
}
else {
result_flags.push((flag, None));
}
}
}
}
@ -229,7 +240,7 @@ impl Args {
let arg = self.lookup_short(*byte)?;
let flag = Flag::Short(*byte);
match arg.takes_value {
Forbidden => result_flags.push((flag, None)),
Forbidden|Optional(_) => result_flags.push((flag, None)),
Necessary(values) => return Err(ParseError::NeedsValue { flag, values })
}
}
@ -238,8 +249,8 @@ impl Args {
let arg = self.lookup_short(*arg_with_value)?;
let flag = Flag::Short(arg.short.unwrap());
match arg.takes_value {
Necessary(_) => result_flags.push((flag, Some(after))),
Forbidden => return Err(ParseError::ForbiddenValue { flag })
Necessary(_)|Optional(_) => result_flags.push((flag, Some(after))),
Forbidden => return Err(ParseError::ForbiddenValue { flag })
}
}
@ -261,7 +272,7 @@ impl Args {
let flag = Flag::Short(*byte);
match arg.takes_value {
Forbidden => result_flags.push((flag, None)),
Necessary(values) => {
Necessary(values)|Optional(values) => {
if index < bytes.len() - 1 {
let remnants = &bytes[index+1 ..];
result_flags.push((flag, Some(OsStr::from_bytes(remnants))));
@ -271,8 +282,17 @@ impl Args {
result_flags.push((flag, Some(next_arg)));
}
else {
return Err(ParseError::NeedsValue { flag, values })
match arg.takes_value {
Forbidden => assert!(false),
Necessary(_) => {
return Err(ParseError::NeedsValue { flag, values });
},
Optional(_) => {
result_flags.push((flag, None));
}
}
}
}
}
}