---

yaml
---
r: 7078
b: refs/heads/master
c: 3e68803
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eade7844a339557e57b2ba0503d8edf19ff60f43
+refs/heads/master: 3e68803891dc384e8c3e5a24bb17700187d86cf7

trunk/src/libcore/vec.rs

@@ -709,7 +709,7 @@ Function: enum_chars
 
 Returns a vector containing a range of chars
 */
-fn enum_chars(start: u8, end: u8) : u8::le(start, end) -> [char] {
+fn enum_chars(start: u8, end: u8) : ::u8::le(start, end) -> [char] {
     let i = start;
     let r = [];
     while i <= end { r += [i as char]; i += 1u as u8; }
@@ -879,6 +879,99 @@ mod unsafe {
     }
 }
 
+/*
+Module: u8
+*/
+mod u8 {
+    export cmp;
+    export lt, le, eq, ne, ge, gt;
+    export hash;
+
+    #[nolink]
+    #[abi = "cdecl"]
+    native mod libc {
+        fn memcmp(s1: *u8, s2: *u8, n: ctypes::size_t) -> ctypes::c_int;
+    }
+
+    /*
+    Function cmp
+
+    Bytewise string comparison
+    */
+    pure fn cmp(&&a: [u8], &&b: [u8]) -> int unsafe {
+        let a_len = len(a);
+        let b_len = len(b);
+        let n = math::min(a_len, b_len) as ctypes::size_t;
+        let r = libc::memcmp(to_ptr(a), to_ptr(b), n) as int;
+
+        if r != 0 { r } else {
+            if a_len == b_len {
+                0
+            } else if a_len < b_len {
+                -1
+            } else {
+                1
+            }
+        }
+    }
+
+    /*
+    Function: lt
+
+    Bytewise less than or equal
+    */
+    pure fn lt(&&a: [u8], &&b: [u8]) -> bool { cmp(a, b) < 0 }
+
+    /*
+    Function: le
+
+    Bytewise less than or equal
+    */
+    pure fn le(&&a: [u8], &&b: [u8]) -> bool { cmp(a, b) <= 0 }
+
+    /*
+    Function: eq
+
+    Bytewise equality
+    */
+    pure fn eq(&&a: [u8], &&b: [u8]) -> bool unsafe { cmp(a, b) == 0 }
+
+    /*
+    Function: ne
+
+    Bytewise inequality
+    */
+    pure fn ne(&&a: [u8], &&b: [u8]) -> bool unsafe { cmp(a, b) != 0 }
+
+    /*
+    Function: ge
+
+    Bytewise greater than or equal
+    */
+    pure fn ge(&&a: [u8], &&b: [u8]) -> bool { cmp(a, b) >= 0 }
+
+    /*
+    Function: gt
+
+    Bytewise greater than
+    */
+    pure fn gt(&&a: [u8], &&b: [u8]) -> bool { cmp(a, b) > 0 }
+
+    /*
+    Function: hash
+
+    String hash function
+    */
+    fn hash(&&s: [u8]) -> uint {
+        // djb hash.
+        // FIXME: replace with murmur.
+
+        let u: uint = 5381u;
+        vec::iter(s, { |c| u *= 33u; u += c as uint; });
+        ret u;
+    }
+}
+
 // Local Variables:
 // mode: rust;
 // fill-column: 78;

trunk/src/libstd/map.rs

@@ -378,6 +378,15 @@ fn new_str_hash<V: copy>() -> hashmap<str, V> {
     ret mk_hashmap(str::hash, str::eq);
 }
 
+/*
+Function: new_bytes_hash
+
+Construct a hashmap for byte string keys
+*/
+fn new_bytes_hash<V: copy>() -> hashmap<[u8], V> {
+    ret mk_hashmap(vec::u8::hash, vec::u8::eq);
+}
+
 /*
 Function: new_int_hash