fix(MultipleValues): stops evaluating values if the max or exact number of values was reached

kbknapp · kbknapp · commit 86d92c9fdbf9 · 2015-04-30T22:17:10.000-04:00
diff --git a/src/app.rs b/src/app.rs
@@ -1153,8 +1153,15 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
                                 skip = true;
                                 1 
                             };
-                            if !skip {
-                                continue;
+                            if let Some(ref mut vals) = o.values {
+                                let len = vals.len() as u8;
+                                if let Some(num) = opt.max_vals {
+                                    if len != num { continue }
+                                } else if let Some(num) = opt.num_vals {
+                                    if len != num { continue }
+                                } else if !skip {
+                                    continue
+                                }
                             }
                         }  
                         skip = true;
@@ -1742,13 +1749,13 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
                         }
                     }
                     if let Some(num) = f.max_vals {
-                        if num > vals.len() as u8 {
+                        if (vals.len() as u8) > num {
                             self.report_error(format!("The argument {} requires no more than {} values, but {} w{} provided", f, num, vals.len(), if vals.len() == 1 {"as"}else{"ere"}),
                                 true, true, Some(matches.args.keys().map(|k| *k).collect::<Vec<_>>()));
                         }
                     }
                     if let Some(num) = f.min_vals {
-                        if num < vals.len() as u8 {
+                        if (vals.len() as u8) < num {
                             self.report_error(format!("The argument {} requires at least {} values, but {} w{} provided", f, num, vals.len(), if vals.len() == 1 {"as"}else{"ere"}),
                                 true, true, Some(matches.args.keys().map(|k| *k).collect::<Vec<_>>()));
                         }

Original file line number	Diff line number	Diff line change
`@@ -1153,8 +1153,15 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{`
`1153`	`1153`	`skip = true;`
`1154`	`1154`	`1`
`1155`	`1155`	`};`
`1156`		`- if !skip {`
`1157`		`- continue;`
	`1156`	`+ if let Some(ref mut vals) = o.values {`
	`1157`	`+ let len = vals.len() as u8;`
	`1158`	`+ if let Some(num) = opt.max_vals {`
	`1159`	`+ if len != num { continue }`
	`1160`	`+ } else if let Some(num) = opt.num_vals {`
	`1161`	`+ if len != num { continue }`
	`1162`	`+ } else if !skip {`
	`1163`	`+ continue`
	`1164`	`+ }`
`1158`	`1165`	`}`
`1159`	`1166`	`}`
`1160`	`1167`	`skip = true;`
`@@ -1742,13 +1749,13 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{`
`1742`	`1749`	`}`
`1743`	`1750`	`}`
`1744`	`1751`	`if let Some(num) = f.max_vals {`
`1745`		`- if num > vals.len() as u8 {`
	`1752`	`+ if (vals.len() as u8) > num {`
`1746`	`1753`	`self.report_error(format!("The argument {} requires no more than {} values, but {} w{} provided", f, num, vals.len(), if vals.len() == 1 {"as"}else{"ere"}),`
`1747`	`1754`	`true, true, Some(matches.args.keys().map(\|k\| *k).collect::<Vec<_>>()));`
`1748`	`1755`	`}`
`1749`	`1756`	`}`
`1750`	`1757`	`if let Some(num) = f.min_vals {`
`1751`		`- if num < vals.len() as u8 {`
	`1758`	`+ if (vals.len() as u8) < num {`
`1752`	`1759`	`self.report_error(format!("The argument {} requires at least {} values, but {} w{} provided", f, num, vals.len(), if vals.len() == 1 {"as"}else{"ere"}),`
`1753`	`1760`	`true, true, Some(matches.args.keys().map(\|k\| *k).collect::<Vec<_>>()));`
`1754`	`1761`	`}`