---

yaml
---
r: 13162
b: refs/heads/master
c: 574b3e8
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 89aa28289bc123a4f3934a6fa439294cefa96093
+refs/heads/master: 574b3e81e662dc1ef1ce13a550cbe5d9c52f9caf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libstd/getopts.rs

@@ -77,7 +77,9 @@ export match;
 export fail_;
 export fail_str;
 export opt_present;
+export opts_present;
 export opt_str;
+export opts_str;
 export opt_strs;
 export opt_maybe_str;
 export opt_default;
@@ -292,6 +294,18 @@ fn opt_present(m: match, nm: str) -> bool {
     ret vec::len::<optval>(opt_vals(m, nm)) > 0u;
 }
 
+#[doc = "Returns true if any of several options were matched"]
+fn opts_present(m: match, names: [str]) -> bool {
+    for vec::each(names) {|nm|
+        alt find_opt(m.opts, mkname(nm)) {
+          some(_) { ret true; }
+          _ { }
+        }
+    }
+    ret false;
+}
+
+
 #[doc = "
 Returns the string argument supplied to a matching option
 
@@ -301,6 +315,23 @@ fn opt_str(m: match, nm: str) -> str {
     ret alt opt_val(m, nm) { val(s) { s } _ { fail } };
 }
 
+#[doc = "
+Returns the string argument supplied to one of several matching options
+
+Fails if the no option was provided from the given list, or if the no such
+option took an argument
+"]
+fn opts_str(m: match, names: [str]) -> str {
+    for vec::each(names) {|nm|
+        alt opt_val(m, nm) {
+          val(s) { ret s }
+          _ {  }
+        }
+    }
+    fail;
+}
+
+
 #[doc = "
 Returns a vector of the arguments provided to all matches of the given option.
 
@@ -805,6 +836,26 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_multi() {
+        let args = ["-e", "foo", "--encrypt", "foo"];
+        let opts = [optopt("e"), optopt("encrypt")];
+        let match = alt getopts(args, opts) {
+          result::ok(m) { m }
+          result::err(f) { fail; }
+        };
+        assert opts_present(match, ["e"]);
+        assert opts_present(match, ["encrypt"]);
+        assert opts_present(match, ["encrypt", "e"]);
+        assert opts_present(match, ["e", "encrypt"]);
+        assert !opts_present(match, ["thing"]);
+        assert !opts_present(match, []);
+
+        assert opts_str(match, ["e"]) == "foo";
+        assert opts_str(match, ["encrypt"]) == "foo";
+        assert opts_str(match, ["e", "encrypt"]) == "foo";
+        assert opts_str(match, ["encrypt", "e"]) == "foo";
+    }
 }
 
 // Local Variables: