---

yaml
---
r: 14259
b: refs/heads/try
c: 748b63f
h: refs/heads/master
i:
  14257: 5367734
  14255: 5ee4033
v: v3

Author: killerswan

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 0e61fe2eeaff507ed409c432988aed40a9fe9c63
+refs/heads/try: 748b63f63f4fb2ac8583900adb5a283990be276b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/str.rs

@@ -908,6 +908,39 @@ fn find(haystack: str, needle: str) -> int {
     ret -1;
 }
 
+// Function: find_chars
+//
+// Find the character position of the first instance of the substring,
+// or return option::none
+//
+// FIXME: rename find_chars -> find,
+//               find -> find_bytes
+fn find_chars(hay: str, pin: str) -> option<uint> {
+   alt find(hay, pin) {
+      -1 { ret option::none; }
+       n { ret option::some(b2c_pos(hay, n as uint)); }
+   }
+}
+
+// Function: b2c_pos
+//
+// Convert a byte position into a char position
+// within a given string
+fn b2c_pos(ss: str, bpos: uint) -> uint {
+   assert bpos < len_bytes(ss);
+
+   let ii = 0u;
+   let cpos = 0u;
+
+   while ii < bpos {
+      let sz = utf8_char_width(ss[ii]);
+      ii += sz;
+      cpos += 1u;
+   }
+
+   ret cpos;
+}
+
 /*
 Function: contains
 
@@ -1718,6 +1751,23 @@ mod tests {
         assert (find(data, "ไท华") == -1);
     }
 
+    #[test]
+    fn test_find_chars() {
+        let data = "ประเทศไทย中华Việt Nam";
+        assert (find_chars(data, "ประเ") == option::some(0u));
+        assert (find_chars(data, "ะเ")   == option::some(2u));
+        assert (find_chars(data, "中华") == option::some(9u));
+        assert (find_chars(data, "ไท华") == option::none);
+    }
+
+    #[test]
+    fn test_b2c_pos() {
+        let data = "ประเทศไทย中华Việt Nam";
+        assert 0u == b2c_pos(data, 0u);
+        assert 2u == b2c_pos(data, 6u);
+        assert 9u == b2c_pos(data, 27u);
+    }
+
     #[test]
     fn test_substr() {
         fn t(a: str, b: str, start: int) {