Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-14 06:42:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: fixes a bug that prevented number_of_values and default_values to be used together

Browse source 
Closes #1050
Closes #1056
This commit is contained in:
Kevin K 2017-10-24 12:56:02 -07:00
parent f7a6955238
commit 5eb342a99d
No known key found for this signature in database
GPG key ID: 17218E4B3692F01A
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/app/parser.rs
View file

@ -1723,17 +1723,24 @@ impl<'a, 'b> Parser<'a, 'b>
} }
pub fn add_defaults(&mut self, matcher: &mut ArgMatcher<'a>) -> ClapResult<()> { pub fn add_defaults(&mut self, matcher: &mut ArgMatcher<'a>) -> ClapResult<()> {
debugln!("Parser::add_defaults;");
macro_rules! add_val { macro_rules! add_val {
(@default $_self:ident, $a:ident, $m:ident) => { (@default $_self:ident, $a:ident, $m:ident) => {
if let Some(ref val) = $a.v.default_val { if let Some(ref val) = $a.v.default_val {
debugln!("Parser::add_defaults:iter:{}: has default vals", $a.b.name);
if $m.get($a.b.name).map(|ma| ma.vals.len()).map(|len| len == 0).unwrap_or(false) { if $m.get($a.b.name).map(|ma| ma.vals.len()).map(|len| len == 0).unwrap_or(false) {
debugln!("Parser::add_defaults:iter:{}: has no user defined vals", $a.b.name);
$_self.add_val_to_arg($a, OsStr::new(val), $m)?; $_self.add_val_to_arg($a, OsStr::new(val), $m)?;
if $_self.cache.map_or(true, |name| name != $a.name()) { if $_self.cache.map_or(true, |name| name != $a.name()) {
arg_post_processing!($_self, $a, $m); arg_post_processing!($_self, $a, $m);
$_self.cache = Some($a.name()); $_self.cache = Some($a.name());
} }
} else if $m.get($a.b.name).is_some() {
debugln!("Parser::add_defaults:iter:{}: has user defined vals", $a.b.name);
} else { } else {
debugln!("Parser::add_defaults:iter:{}: wasn't used", $a.b.name);
$_self.add_val_to_arg($a, OsStr::new(val), $m)?; $_self.add_val_to_arg($a, OsStr::new(val), $m)?;
if $_self.cache.map_or(true, |name| name != $a.name()) { if $_self.cache.map_or(true, |name| name != $a.name()) {
@ -1741,10 +1748,13 @@ impl<'a, 'b> Parser<'a, 'b>
$_self.cache = Some($a.name()); $_self.cache = Some($a.name());
} }
} }
} else {
debugln!("Parser::add_defaults:iter:{}: doesn't have default vals", $a.b.name);
} }
}; };
($_self:ident, $a:ident, $m:ident) => { ($_self:ident, $a:ident, $m:ident) => {
if let Some(ref vm) = $a.v.default_vals_ifs { if let Some(ref vm) = $a.v.default_vals_ifs {
sdebugln!(" has conditional defaults");
let mut done = false; let mut done = false;
if $m.get($a.b.name).is_none() { if $m.get($a.b.name).is_none() {
for &(arg, val, default) in vm.values() { for &(arg, val, default) in vm.values() {
@ -1772,15 +1782,19 @@ impl<'a, 'b> Parser<'a, 'b>
if done { if done {
continue; // outer loop (outside macro) continue; // outer loop (outside macro)
} }
} else {
sdebugln!(" doesn't have conditional defaults");
} }
add_val!(@default $_self, $a, $m) add_val!(@default $_self, $a, $m)
}; };
} }
for o in &self.opts { for o in &self.opts {
debug!("Parser::add_defaults:iter:{}:", o.b.name);
add_val!(self, o, matcher); add_val!(self, o, matcher);
} }
for p in self.positionals.values() { for p in self.positionals.values() {
debug!("Parser::add_defaults:iter:{}:", p.b.name);
add_val!(self, p, matcher); add_val!(self, p, matcher);
} }
Ok(()) Ok(())