---

yaml
---
r: 14223
b: refs/heads/try
c: c82a0d7
h: refs/heads/master
i:
  14221: 42cd1f5
  14219: bda27b9
  14215: 531c589
  14207: f09eb4b
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 207bb3d2df92f896145b3f2ef8aa5ca5cea00104
+refs/heads/try: c82a0d7c3c0c0fda158102af7bc5af2823df2f06
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/cargo/cargo.rs

@@ -651,27 +651,25 @@ fn cmd_install(c: cargo) unsafe {
 
     if str::starts_with(target, "uuid:") {
         let uuid = rest(target, 5u);
-        alt str::index(uuid, '/') {
-            option::some(idx) {
-               let source = str::slice(uuid, 0u, idx);
-               uuid = str::slice(uuid, idx + 1u, str::char_len(uuid));
-               install_uuid_specific(c, wd, source, uuid);
-            }
-            option::none {
-               install_uuid(c, wd, uuid);
-            }
+        let idx = str::index(uuid, '/' as u8);
+        if idx != -1 {
+            let source = str::unsafe::slice_bytes(uuid, 0u, idx as uint);
+            uuid = str::unsafe::slice_bytes(uuid, idx as uint + 1u,
+                                      str::byte_len(uuid));
+            install_uuid_specific(c, wd, source, uuid);
+        } else {
+            install_uuid(c, wd, uuid);
         }
     } else {
         let name = target;
-        alt str::index(name, '/') {
-            option::some(idx) {
-               let source = str::slice(name, 0u, idx);
-               name = str::slice(name, idx + 1u, str::char_len(name));
-               install_named_specific(c, wd, source, name);
-            }
-            option::none {
-               install_named(c, wd, name);
-            }
+        let idx = str::index(name, '/' as u8);
+        if idx != -1 {
+            let source = str::unsafe::slice_bytes(name, 0u, idx as uint);
+            name = str::unsafe::slice_bytes(name, idx as uint + 1u,
+                                      str::byte_len(name));
+            install_named_specific(c, wd, source, name);
+        } else {
+            install_named(c, wd, name);
         }
     }
 }

branches/try/src/comp/back/link.rs

@@ -109,16 +109,14 @@ mod write {
     // Decides what to call an intermediate file, given the name of the output
     // and the extension to use.
     fn mk_intermediate_name(output_path: str, extension: str) -> str unsafe {
-        let stem = alt str::index(output_path, '.') {
-                       option::some(dot_pos) {
-                           str::slice(output_path, 0u, dot_pos)
-                       }
-                       option::none { output_path }
-                   };
-
+        let dot_pos = str::index(output_path, '.' as u8);
+        let stem;
+        if dot_pos < 0 {
+            stem = output_path;
+        } else { stem = str::unsafe::slice_bytes(output_path, 0u,
+                                                 dot_pos as uint); }
         ret stem + "." + extension;
     }
-
     fn run_passes(sess: session, llmod: ModuleRef, output: str) {
         let opts = sess.opts;
         if opts.time_llvm_passes { llvm::LLVMRustEnableTimePasses(); }

branches/try/src/comp/syntax/codemap.rs

@@ -119,13 +119,16 @@ fn get_line(fm: filemap, line: int) -> str unsafe {
     let end: uint;
     if line as uint < vec::len(fm.lines) - 1u {
         end = fm.lines[line + 1].byte - fm.start_pos.byte;
-        ret str::unsafe::slice_bytes(*fm.src, begin, end);
     } else {
         // If we're not done parsing the file, we're at the limit of what's
         // parsed. If we just slice the rest of the string, we'll print out
         // the remainder of the file, which is undesirable.
-        ret str::splitn_char(*fm.src, '\n', 1u)[0];
+        end = str::byte_len(*fm.src);
+        let rest = str::unsafe::slice_bytes(*fm.src, begin, end);
+        let newline = str::index(rest, '\n' as u8);
+        if newline != -1 { end = begin + (newline as uint); }
     }
+    ret str::unsafe::slice_bytes(*fm.src, begin, end);
 }
 
 fn lookup_byte_offset(cm: codemap::codemap, chpos: uint)

branches/try/src/fuzzer/fuzzer.rs

@@ -283,9 +283,10 @@ fn check_variants_T<T: copy>(
     }
 }
 
-fn last_part(filename: str) -> str {
-  let ix = option::get(str::rindex(filename, '/'));
-  str::slice(filename, ix + 1u, str::char_len(filename) - 3u)
+fn last_part(filename: str) -> str unsafe {
+  let ix = str::rindex(filename, 47u8 /* '/' */);
+  assert ix >= 0;
+  str::unsafe::slice_bytes(filename, ix as uint + 1u, str::byte_len(filename) - 3u)
 }
 
 enum happiness { passed, cleanly_rejected(str), known_bug(str), failed(str), }

branches/try/src/libcore/char.rs

@@ -37,6 +37,7 @@ export is_alphabetic,
        is_XID_start, is_XID_continue,
        is_lowercase, is_uppercase,
        is_whitespace, is_alphanumeric,
+       is_ascii, is_digit,
        to_digit, to_lower, to_upper, maybe_digit, cmp;
 
 import is_alphabetic = unicode::derived_property::Alphabetic;
@@ -84,6 +85,17 @@ pure fn is_alphanumeric(c: char) -> bool {
         unicode::general_category::No(c);
 }
 
+#[doc( brief = "Indicates whether the character is an ASCII character" )]
+pure fn is_ascii(c: char) -> bool {
+   c - ('\x7F' & c) == '\x00'
+}
+
+#[doc( brief = "Indicates whether the character is numeric (Nd, Nl, or No)" )]
+pure fn is_digit(c: char) -> bool {
+    ret unicode::general_category::Nd(c) ||
+        unicode::general_category::Nl(c) ||
+        unicode::general_category::No(c);
+}
 
 #[doc(
   brief = "Convert a char to the corresponding digit. \
@@ -221,3 +233,20 @@ fn test_to_upper() {
     //assert (to_upper('ü') == 'Ü');
     assert (to_upper('ß') == 'ß');
 }
+
+#[test]
+fn test_is_ascii() unsafe {
+   assert str::all("banana", char::is_ascii);
+   assert ! str::all("ประเทศไทย中华Việt Nam", char::is_ascii);
+}
+
+#[test]
+fn test_is_digit() {
+   assert is_digit('2');
+   assert is_digit('7');
+   assert ! is_digit('c');
+   assert ! is_digit('i');
+   assert ! is_digit('z');
+   assert ! is_digit('Q');
+}
+

branches/try/src/libcore/str.rs

@@ -253,12 +253,15 @@ Function: pop_char
 Remove the final character from a string and return it.
 
 Failure:
+
 If the string does not contain any characters.
 */
 fn pop_char(&s: str) -> char unsafe {
     let end = byte_len(s);
-    let {ch:ch, prev:end} = char_range_at_reverse(s, end);
-    s = unsafe::slice_bytes(s, 0u, end);
+    while end > 0u && s[end - 1u] & 192u8 == tag_cont_u8 { end -= 1u; }
+    assert (end > 0u);
+    let ch = char_at(s, end - 1u);
+    s = unsafe::slice_bytes(s, 0u, end - 1u);
     ret ch;
 }
 
@@ -865,50 +868,32 @@ fn lines_iter(ss: str, ff: fn(&&str)) {
 Section: Searching
 */
 
-// Function: index
-//
-// Returns the index of the first matching char
-// (as option some/none)
-fn index(ss: str, cc: char) -> option<uint> {
-    let bii = 0u;
-    let cii = 0u;
-    let len = byte_len(ss);
-    while bii < len {
-        let {ch, next} = char_range_at(ss, bii);
-
-        // found here?
-        if ch == cc {
-            ret option::some(cii);
-        }
+/*
+Function: index
 
-        cii += 1u;
-        bii = next;
-    }
+Returns the index of the first matching byte. Returns -1 if
+no match is found.
 
-    // wasn't found
-    ret option::none;
+FIXME: UTF-8
+*/
+fn index(s: str, c: u8) -> int {
+    let i: int = 0;
+    for k: u8 in s { if k == c { ret i; } i += 1; }
+    ret -1;
 }
 
-// Function: rindex
-//
-// Returns the index of the first matching char
-// (as option some/none)
-fn rindex(ss: str, cc: char) -> option<uint> {
-    let bii = byte_len(ss);
-    let cii = char_len(ss);
-    while bii > 0u {
-        let {ch, prev} = char_range_at_reverse(ss, bii);
-        cii -= 1u;
-        bii = prev;
-
-        // found here?
-        if ch == cc {
-            ret option::some(cii);
-        }
-    }
+/*
+Function: rindex
 
-    // wasn't found
-    ret option::none;
+Returns the index of the last matching byte. Returns -1
+if no match is found.
+
+FIXME: UTF-8
+*/
+fn rindex(s: str, c: u8) -> int {
+    let n: int = byte_len(s) as int;
+    while n >= 0 { if s[n] == c { ret n; } n -= 1; }
+    ret n;
 }
 
 /*
@@ -1248,25 +1233,6 @@ Pluck a character out of a string
 */
 fn char_at(s: str, i: uint) -> char { ret char_range_at(s, i).ch; }
 
-// Function: char_range_at_reverse
-//
-// Given a byte position and a str, return the previous char and its position
-// This function can be used to iterate over a unicode string in reverse.
-fn char_range_at_reverse(ss: str, start: uint) -> {ch: char, prev: uint} {
-    let prev = start;
-
-    // while there is a previous byte == 10......
-    while prev > 0u && ss[prev - 1u] & 192u8 == tag_cont_u8 {
-        prev -= 1u;
-    }
-
-    // now refer to the initial byte of previous char
-    prev -= 1u;
-
-    let ch = char_at(ss, prev);
-    ret {ch:ch, prev:prev};
-}
-
 /*
 Function: substr_all
 
@@ -1476,42 +1442,13 @@ mod tests {
     }
 
     #[test]
-    fn test_index() {
-        assert ( index("hello", 'h') == option::some(0u));
-        assert ( index("hello", 'e') == option::some(1u));
-        assert ( index("hello", 'o') == option::some(4u));
-        assert ( index("hello", 'z') == option::none);
-    }
-
-    #[test]
-    fn test_rindex() {
-        assert (rindex("hello", 'l') == option::some(3u));
-        assert (rindex("hello", 'o') == option::some(4u));
-        assert (rindex("hello", 'h') == option::some(0u));
-        assert (rindex("hello", 'z') == option::none);
-    }
-
-    #[test]
-    fn test_pop_char() {
-        let data = "ประเทศไทย中华";
-        let cc = pop_char(data);
-        assert "ประเทศไทย中" == data;
-        assert '华' == cc;
-    }
-
-    #[test]
-    fn test_pop_char_2() {
-        let data2 = "华";
-        let cc2 = pop_char(data2);
-        assert "" == data2;
-        assert '华' == cc2;
-    }
-
-    #[test]
-    #[should_fail]
-    fn test_pop_char_fail() {
-        let data = "";
-        let _cc3 = pop_char(data);
+    fn test_index_and_rindex() {
+        assert (index("hello", 'e' as u8) == 1);
+        assert (index("hello", 'o' as u8) == 4);
+        assert (index("hello", 'z' as u8) == -1);
+        assert (rindex("hello", 'l' as u8) == 3);
+        assert (rindex("hello", 'h' as u8) == 0);
+        assert (rindex("hello", 'z' as u8) == -1);
     }
 
     #[test]

branches/try/src/libstd/fs.rs

@@ -32,22 +32,6 @@ A path or fragment of a filesystem path
 */
 type path = str;
 
-fn splitDirnameBasename (pp: path) -> {dirname: str, basename: str} {
-    let ii;
-    alt str::rindex(pp, os_fs::path_sep) {
-        option::some(xx) { ii = xx; }
-        option::none {
-            alt str::rindex(pp, os_fs::alt_path_sep) {
-                option::some(xx) { ii = xx; }
-                option::none { ret {dirname: ".", basename: pp}; }
-            }
-        }
-    }
-
-    ret {dirname: str::slice(pp, 0u, ii),
-         basename: str::slice(pp, ii + 1u, str::char_len(pp))};
-}
-
 /*
 Function: dirname
 
@@ -59,8 +43,13 @@ The dirname of "/usr/share" will be "/usr", but the dirname of
 
 If the path is not prefixed with a directory, then "." is returned.
 */
-fn dirname(pp: path) -> path {
-    ret splitDirnameBasename(pp).dirname;
+fn dirname(p: path) -> path unsafe {
+    let i: int = str::rindex(p, os_fs::path_sep as u8);
+    if i == -1 {
+        i = str::rindex(p, os_fs::alt_path_sep as u8);
+        if i == -1 { ret "."; }
+    }
+    ret str::unsafe::slice_bytes(p, 0u, i as uint);
 }
 
 /*
@@ -74,10 +63,18 @@ path separators in the path then the returned path is identical to
 the provided path. If an empty path is provided or the path ends
 with a path separator then an empty path is returned.
 */
-fn basename(pp: path) -> path {
-    ret splitDirnameBasename(pp).basename;
+fn basename(p: path) -> path unsafe {
+    let i: int = str::rindex(p, os_fs::path_sep as u8);
+    if i == -1 {
+        i = str::rindex(p, os_fs::alt_path_sep as u8);
+        if i == -1 { ret p; }
+    }
+    let len = str::byte_len(p);
+    if (i + 1) as uint >= len { ret p; }
+    ret str::unsafe::slice_bytes(p, (i + 1) as uint, len);
 }
 
+
 // FIXME: Need some typestate to avoid bounds check when len(pre) == 0
 /*
 Function: connect