Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2025-03-04 23:37:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11 from kbknapp/onlyposfollows

Browse source 
Closes #10 (Adds support for "--" where only positional arguments follow)
This commit is contained in:
Kevin K. 2015-03-17 20:57:51 -04:00
commit e6ca4cfc1b
1 changed files with 46 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/app.rs
View file

@ -703,13 +703,14 @@ impl App {
fn get_matches_from(&mut self, matches: &mut ArgMatches, it: &mut IntoIter<String>) { fn get_matches_from(&mut self, matches: &mut ArgMatches, it: &mut IntoIter<String>) {
self.create_help_and_version(); self.create_help_and_version();
// let mut needs_val = false; let mut pos_only = false;
let mut subcmd_name: Option<&'static str> = None; let mut subcmd_name: Option<&'static str> = None;
let mut needs_val_of: Option<&'static str> = None; let mut needs_val_of: Option<&'static str> = None;
let mut pos_counter = 1; let mut pos_counter = 1;
while let Some(arg) = it.next() { while let Some(arg) = it.next() {
let arg_slice = arg.as_slice(); let arg_slice = arg.as_slice();
let mut skip = false; let mut skip = false;
if ! pos_only {
if let Some(nvo) = needs_val_of { if let Some(nvo) = needs_val_of {
if let Some(ref opt) = self.opts.get(nvo) { if let Some(ref opt) = self.opts.get(nvo) {
if self.blacklist.contains(opt.name) { if self.blacklist.contains(opt.name) {
@ -754,15 +755,19 @@ impl App {
skip = true; skip = true;
} }
} }
}
if skip { if skip {
needs_val_of = None; needs_val_of = None;
continue; continue;
} }
if arg_slice.starts_with("--") { if arg_slice.starts_with("--") && ! pos_only {
if arg_slice.len() == 2 {
pos_only = true;
continue;
}
// Single flag, or option long version // Single flag, or option long version
needs_val_of = self.parse_long_arg(matches, &arg); needs_val_of = self.parse_long_arg(matches, &arg);
} else if arg_slice.starts_with("-") && arg_slice.len() != 1 && ! pos_only {
} else if arg_slice.starts_with("-") && arg_slice.len() != 1 {
needs_val_of = self.parse_short_arg(matches, &arg); needs_val_of = self.parse_short_arg(matches, &arg);
} else { } else {
// Positional or Subcommand // Positional or Subcommand