mirror of
https://github.com/clap-rs/clap
synced 2024-12-13 22:32:33 +00:00
v0.0.3.7
This commit is contained in:
Kevin K
parent
946395167b
commit
55f402d8e4
1 changed files with 115 additions and 109 deletions
110
src/app.rs
110
src/app.rs
|
|
@ -110,37 +110,11 @@ impl App {
|
|||
unsafe { libc::exit(0); }
|
||||
}
|
||||
|
||||
pub fn get_matches(&mut self) -> ArgMatches {
|
||||
|
||||
let mut matches = ArgMatches::new(self);
|
||||
|
||||
let mut needs_val = false;
|
||||
let mut needs_val_of = String::new();
|
||||
let mut pos_counter = 1;
|
||||
for arg in env::args().collect::<Vec<String>>().tail() {
|
||||
let arg_slice = arg.as_slice();
|
||||
if needs_val {
|
||||
for o in self.opts.iter() {
|
||||
if needs_val_of == o.name.to_string() {
|
||||
matches.opts.push(OptArg{
|
||||
name: o.name,
|
||||
short: o.short,
|
||||
long: o.long,
|
||||
help: o.help,
|
||||
required: o.required,
|
||||
value: Some(arg.clone())
|
||||
});
|
||||
needs_val = false;
|
||||
needs_val_of.clear();
|
||||
break;
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if arg_slice.starts_with("--") {
|
||||
// Single flag, or option
|
||||
let mut p_arg = arg_slice.trim_left_matches(|c| c == '-');
|
||||
fn parse_long_arg(&self, matches: &mut ArgMatches, arg: &str) -> &'static str {
|
||||
let mut p_arg = arg.trim_left_matches(|c| c == '-');
|
||||
let mut found = false;
|
||||
let mut needs_val = false;
|
||||
|
||||
if p_arg == "help" && self.needs_long_help {
|
||||
self.print_help();
|
||||
} else if p_arg == "version" && self.needs_long_version {
|
||||
|
|
@ -149,20 +123,19 @@ impl App {
|
|||
for f in self.flags.iter() {
|
||||
if let Some(l) = f.long {
|
||||
if l == p_arg {
|
||||
matches.flags.push(f.clone());
|
||||
found = true;
|
||||
break;
|
||||
matches.flags.push(f.clone());
|
||||
return "";
|
||||
}
|
||||
}
|
||||
}
|
||||
if found { continue; }
|
||||
if p_arg.as_slice().contains("=") {
|
||||
if p_arg.contains("=") {
|
||||
let p_argv: Vec<&str> = p_arg.split_str("=").collect();
|
||||
p_arg = p_argv[0];
|
||||
for o in self.opts.iter() {
|
||||
if let Some(l) = o.long {
|
||||
if l == p_arg {
|
||||
// found = true;
|
||||
found = true;
|
||||
matches.opts.push(OptArg{
|
||||
name: o.name,
|
||||
short: o.short,
|
||||
|
|
@ -179,22 +152,23 @@ impl App {
|
|||
for o in self.opts.iter() {
|
||||
if let Some(l) = o.long {
|
||||
if l == p_arg {
|
||||
found = true;
|
||||
needs_val = true;
|
||||
needs_val_of = o.name.to_string();
|
||||
break;
|
||||
return o.name;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Fails if argument supplied to binary isn't valid
|
||||
assert!(found == false);
|
||||
continue;
|
||||
|
||||
""
|
||||
}
|
||||
} else if arg_slice.starts_with("-") {
|
||||
if arg_slice.len() > 2 {
|
||||
// Multiple flags using short i.e. -bgHlS
|
||||
let p_arg = arg_slice.trim_left_matches(|c| c == '-');
|
||||
|
||||
fn parse_short_arg(&self, matches: &mut ArgMatches, arg: &str) -> &'static str {
|
||||
let mut found = false;
|
||||
if arg.len() > 2 {
|
||||
// Multiple flags using short i.e. -bgHlS
|
||||
let p_arg = arg.trim_left_matches(|c| c == '-');
|
||||
for c in p_arg.chars() {
|
||||
if c == 'h' && self.needs_short_help {
|
||||
self.print_help();
|
||||
|
|
@ -211,12 +185,11 @@ impl App {
|
|||
}
|
||||
// Fails if argument supplied to binary isn't valid
|
||||
assert!(found == false);
|
||||
continue;
|
||||
return "";
|
||||
}
|
||||
} else {
|
||||
// Short flag or opt
|
||||
let mut found = false;
|
||||
let p_arg = arg_slice.char_at(1);
|
||||
let p_arg = arg.char_at(1);
|
||||
if p_arg == 'h' && self.needs_short_help {
|
||||
self.print_help();
|
||||
} else if p_arg == 'v' && self.needs_short_version {
|
||||
|
|
@ -233,22 +206,55 @@ impl App {
|
|||
for o in self.opts.iter() {
|
||||
if let Some(s) = o.short {
|
||||
if s == p_arg {
|
||||
found = true;
|
||||
needs_val = true;
|
||||
needs_val_of = o.name.to_string();
|
||||
break;
|
||||
return o.name;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// Fails if argument supplied to binary isn't valid
|
||||
assert!(found == false);
|
||||
|
||||
""
|
||||
}
|
||||
|
||||
pub fn get_matches(&mut self) -> ArgMatches {
|
||||
|
||||
let mut matches = ArgMatches::new(self);
|
||||
|
||||
// let mut needs_val = false;
|
||||
let mut needs_val_of = String::new();
|
||||
let mut pos_counter = 1;
|
||||
for arg in env::args().collect::<Vec<String>>().tail() {
|
||||
let arg_slice = arg.as_slice();
|
||||
if needs_val_of.is_empty() {
|
||||
for o in self.opts.iter() {
|
||||
if needs_val_of == o.name.to_string() {
|
||||
matches.opts.push(OptArg{
|
||||
name: o.name,
|
||||
short: o.short,
|
||||
long: o.long,
|
||||
help: o.help,
|
||||
required: o.required,
|
||||
value: Some(arg.clone())
|
||||
});
|
||||
needs_val_of.clear();
|
||||
break;
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if arg_slice.starts_with("--") {
|
||||
// Single flag, or option
|
||||
needs_val_of = self.parse_long_arg(&mut matches, arg_slice).to_string();
|
||||
|
||||
} else if arg_slice.starts_with("-") {
|
||||
needs_val_of = self.parse_short_arg(&mut matches, arg_slice).to_string();
|
||||
} else {
|
||||
// Positional
|
||||
|
||||
// Fails if no positionals are expected/possible
|
||||
assert!(self.positionals.is_empty() == false);
|
||||
|
||||
for p in self.positionals.iter() {
|
||||
matches.positionals.push(PosArg{
|
||||
name: p.name,
|
||||
|
|
@ -266,7 +272,7 @@ impl App {
|
|||
// Fails if we reached the end of args() but were still
|
||||
// expecting a value, such as ./fake -c
|
||||
// where -c takes a value
|
||||
assert!(needs_val == false);
|
||||
assert!(needs_val_of.is_empty());
|
||||
|
||||
matches
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue