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

Fixed #22

Browse source
This commit is contained in:
Kevin K 2015-03-21 10:22:46 -04:00
parent adbce3bdc4
commit cf4dc688a5
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/app.rs
View file

@ -201,6 +201,15 @@ impl App {
self.required.insert(a.name);
}
if let Some(i) = a.index {
if a.short.is_some() || a.long.is_some() {
panic!("Argument \"{}\" has conflicting requirements, both index() and short(), or long(), were supplied", a.name);
}
if a.multiple {
panic!("Argument \"{}\" has conflicting requirements, both index() and multiple(true) were supplied",a.name);
}
if a.takes_value {
panic!("Argument \"{}\" has conflicting requirements, both index() and takes_value(true) were supplied", a.name);
}
self.positionals_idx.insert(i, PosArg {
name: a.name,
index: i,
@ -211,9 +220,11 @@ impl App {
value: None
});
} else if a.takes_value {
if a.short == None && a.long == None {
panic!("An argument that takes a value must have either a .short() or .long() [or both] assigned");
if a.short.is_none() && a.long.is_none() {
panic!("Argument \"{}\" has take_value(true), yet neither a short() or long() were supplied", a.name);
}
// No need to check for .index() as that is handled above
self.opts.insert(a.name, OptArg {
name: a.name,
short: a.short,
@ -241,13 +252,19 @@ impl App {
self.needs_short_version = false;
}
}
if a.short == None && a.long == None {
panic!("A flag argument must have either a .short() or .long() [or both] assigned");
if a.short.is_none() && a.long.is_none() {
panic!("Argument \"{}\" must have either a short() and/or long() supplied since no index() or takes_value() were found", a.name);
}
if a.required {
panic!("Argument \"{}\" cannot be required(true) because it has no index() or takes_value(true)", a.name)
}
// No need to check for index() or takes_value() as that is handled above
// Flags can't be required
if self.required.contains(a.name) {
self.required.remove(a.name);
}
// This should be unreachable...
// if self.required.contains(a.name) {
// self.required.remove(a.name);
// }
self.flags.insert(a.name, FlagArg{
name: a.name,
short: a.short,

4
src/args/arg.rs
View file

@ -283,7 +283,6 @@ impl Arg {
/// .takes_value(true)
/// # ).get_matches();
pub fn takes_value(mut self, tv: bool) -> Arg {
assert!(self.index == None);
self.takes_value = tv;
self
}
@ -305,8 +304,6 @@ impl Arg {
/// .index(1)
/// # ).get_matches();
pub fn index(mut self, idx: u8) -> Arg {
assert!(self.takes_value == false);
if idx < 1 { panic!("Argument index must start at 1"); }
self.index = Some(idx);
self
}
@ -329,7 +326,6 @@ impl Arg {
/// .multiple(true)
/// # ).get_matches();
pub fn multiple(mut self, multi: bool) -> Arg {
assert!(self.index == None);
self.multiple = multi;
self
}