---

yaml
---
r: 39029
b: refs/heads/incoming
c: 5e4ed70
h: refs/heads/master
i:
  39027: 4c8e6e1
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: e2f4f06625ea4d4a98e7bc7c032380a1cba91d18
+refs/heads/incoming: 5e4ed709cba6bf0d6df3b50b86c12cd59cf4f842
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/getopts.rs

@@ -145,6 +145,11 @@ pub fn optflag(name: &str) -> Opt {
     return {name: mkname(name), hasarg: No, occur: Optional};
 }
 
+/// Create an option that is optional and does not take an argument
+pub fn optflagmulti(name: &str) -> Opt {
+    return {name: mkname(name), hasarg: No, occur: Multi};
+}
+
 /// Create an option that is optional and takes an optional argument
 pub fn optflagopt(name: &str) -> Opt {
     return {name: mkname(name), hasarg: Maybe, occur: Optional};
@@ -417,6 +422,11 @@ pub fn opt_present(mm: Matches, nm: &str) -> bool {
     return vec::len::<Optval>(opt_vals(mm, nm)) > 0u;
 }
 
+/// Returns the number of times an option was matched
+pub fn opt_count(mm: Matches, nm: &str) -> uint {
+    return vec::len::<Optval>(opt_vals(mm, nm));
+}
+
 /// Returns true if any of several options were matched
 pub fn opts_present(mm: Matches, names: &[~str]) -> bool {
     for vec::each(names) |nm| {
@@ -1003,6 +1013,71 @@ mod tests {
         }
     }
 
+    // Tests for optflagmulti
+    #[test]
+    fn test_optflagmulti_short1() {
+        let args = ~[~"-v"];
+        let opts = ~[optflagmulti(~"v")];
+        let rs = getopts(args, opts);
+        match rs {
+          Ok(copy m) => {
+            assert (opt_count(m, ~"v") == 1);
+          }
+          _ => fail
+        }
+    }
+
+    #[test]
+    fn test_optflagmulti_short2a() { 
+        let args = ~[~"-v", ~"-v"];
+        let opts = ~[optflagmulti(~"v")];
+        let rs = getopts(args, opts);
+        match rs {
+          Ok(copy m) => {
+            assert (opt_count(m, ~"v") == 2);
+          }
+          _ => fail
+        }
+    }
+
+    #[test]
+    fn test_optflagmulti_short2b() {
+        let args = ~[~"-vv"];
+        let opts = ~[optflagmulti(~"v")];
+        let rs = getopts(args, opts);
+        match rs {
+          Ok(copy m) => {
+            assert (opt_count(m, ~"v") == 2);
+          }
+          _ => fail
+        }
+    }
+
+    #[test]
+    fn test_optflagmulti_long1() {
+        let args = ~[~"--verbose"];
+        let opts = ~[optflagmulti(~"verbose")];
+        let rs = getopts(args, opts);
+        match rs {
+          Ok(copy m) => {
+            assert (opt_count(m, ~"verbose") == 1);
+          }
+          _ => fail
+        }
+    }
+
+    #[test]
+    fn test_optflagmulti_long2() {
+        let args = ~[~"--verbose", ~"--verbose"];
+        let opts = ~[optflagmulti(~"verbose")];
+        let rs = getopts(args, opts);
+        match rs {
+          Ok(copy m) => {
+            assert (opt_count(m, ~"verbose") == 2);
+          }
+          _ => fail
+        }
+    }
 
     // Tests for optmulti
     #[test]