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

refactor: Always inc occurrences before adding values

Browse source 
This is the logical order people think in terms of (`--foo` comes before
`val` in `--foo val`). This also opens things up for using occurrence
incrementing as a place to handle occurrence transitions, like
overrides.
This commit is contained in:
Ed Page 2021-12-27 13:50:46 -06:00
parent d7f27e8732
commit cb393e4439
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/parse/parser.rs
View file

@ -591,6 +591,10 @@ impl<'help, 'app> Parser<'help, 'app> {
} }
self.seen.push(p.id.clone()); self.seen.push(p.id.clone());
// Increase occurrence no matter if we are appending, occurrences
// of positional argument equals to number of values rather than
// the number of value groups.
self.inc_occurrence_of_arg(matcher, p);
// Creating new value group rather than appending when the arg // Creating new value group rather than appending when the arg
// doesn't have any value. This behaviour is right because // doesn't have any value. This behaviour is right because
// positional arguments are always present continuously. // positional arguments are always present continuously.
@ -604,11 +608,6 @@ impl<'help, 'app> Parser<'help, 'app> {
trailing_values, trailing_values,
); );
// Increase occurrence no matter if we are appending, occurrences
// of positional argument equals to number of values rather than
// the number of value groups.
self.inc_occurrence_of_arg(matcher, p);
// Only increment the positional counter if it doesn't allow multiples // Only increment the positional counter if it doesn't allow multiples
if !p.is_multiple() { if !p.is_multiple() {
pos_counter += 1; pos_counter += 1;
@ -1302,6 +1301,7 @@ impl<'help, 'app> Parser<'help, 'app> {
if opt.is_set(ArgSettings::RequireEquals) && !has_eq { if opt.is_set(ArgSettings::RequireEquals) && !has_eq {
if opt.min_vals == Some(0) { if opt.min_vals == Some(0) {
debug!("Requires equals, but min_vals == 0"); debug!("Requires equals, but min_vals == 0");
self.inc_occurrence_of_arg(matcher, opt);
// We assume this case is valid: require equals, but min_vals == 0. // We assume this case is valid: require equals, but min_vals == 0.
if !opt.default_missing_vals.is_empty() { if !opt.default_missing_vals.is_empty() {
debug!("Parser::parse_opt: has default_missing_vals"); debug!("Parser::parse_opt: has default_missing_vals");
@ -1313,7 +1313,6 @@ impl<'help, 'app> Parser<'help, 'app> {
false, false,
); );
}; };
self.inc_occurrence_of_arg(matcher, opt);
if attached_value.is_some() { if attached_value.is_some() {
ParseResult::AttachedValueNotConsumed ParseResult::AttachedValueNotConsumed
} else { } else {
@ -1333,6 +1332,7 @@ impl<'help, 'app> Parser<'help, 'app> {
fv, fv,
fv.starts_with("=") fv.starts_with("=")
); );
self.inc_occurrence_of_arg(matcher, opt);
self.add_val_to_arg( self.add_val_to_arg(
opt, opt,
v, v,
@ -1341,7 +1341,6 @@ impl<'help, 'app> Parser<'help, 'app> {
false, false,
trailing_values, trailing_values,
); );
self.inc_occurrence_of_arg(matcher, opt);
ParseResult::ValuesDone ParseResult::ValuesDone
} else { } else {
debug!("Parser::parse_opt: More arg vals required..."); debug!("Parser::parse_opt: More arg vals required...");
@ -1470,8 +1469,8 @@ impl<'help, 'app> Parser<'help, 'app> {
fn parse_flag(&self, flag: &Arg<'help>, matcher: &mut ArgMatcher) -> ParseResult { fn parse_flag(&self, flag: &Arg<'help>, matcher: &mut ArgMatcher) -> ParseResult {
debug!("Parser::parse_flag"); debug!("Parser::parse_flag");
matcher.add_index_to(&flag.id, self.cur_idx.get(), ValueType::CommandLine);
self.inc_occurrence_of_arg(matcher, flag); self.inc_occurrence_of_arg(matcher, flag);
matcher.add_index_to(&flag.id, self.cur_idx.get(), ValueType::CommandLine);
ParseResult::ValuesDone ParseResult::ValuesDone
} }