---

yaml
---
r: 708
b: refs/heads/master
c: 2880ecd
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 738fe078a43c3f184d0e147f89042474a61fa779
+refs/heads/master: 2880ecd73ff7443ad72eb7af3c85e673024fc7fd

trunk/src/lib/_int.rs

@@ -19,18 +19,27 @@ fn nonpositive(int x) -> bool { ret x <= 0; }
 fn nonnegative(int x) -> bool { ret x >= 0; }
 
 iter range(mutable int lo, int hi) -> int {
-  while (lo < hi) {
-    put lo;
-    lo += 1;
-  }
+    while (lo < hi) {
+        put lo;
+        lo += 1;
+    }
 }
 
 fn to_str(mutable int n, uint radix) -> str
 {
-  check (0u < radix && radix <= 16u);
-  if (n < 0) {
-    ret "-" + _uint.to_str((-n) as uint, radix);
-  } else {
-    ret _uint.to_str(n as uint, radix);
-  }
+    check (0u < radix && radix <= 16u);
+    if (n < 0) {
+        ret "-" + _uint.to_str((-n) as uint, radix);
+    } else {
+        ret _uint.to_str(n as uint, radix);
+    }
 }
+
+// Local Variables:
+// mode: rust;
+// fill-column: 78;
+// indent-tabs-mode: nil
+// c-basic-offset: 4
+// buffer-file-coding-system: utf-8-unix
+// compile-command: "make -k -C .. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// End:

trunk/src/lib/_str.rs

@@ -3,58 +3,58 @@ import rustrt.sbuf;
 import std._vec.rustrt.vbuf;
 
 native "rust" mod rustrt {
-  type sbuf;
-  fn str_buf(str s) -> sbuf;
-  fn str_byte_len(str s) -> uint;
-  fn str_alloc(uint n_bytes) -> str;
-  fn str_from_vec(vec[u8] b) -> str;
-  fn refcount[T](str s) -> uint;
+    type sbuf;
+    fn str_buf(str s) -> sbuf;
+    fn str_byte_len(str s) -> uint;
+    fn str_alloc(uint n_bytes) -> str;
+    fn str_from_vec(vec[u8] b) -> str;
+    fn refcount[T](str s) -> uint;
 }
 
 fn eq(&str a, &str b) -> bool {
-  let uint i = byte_len(a);
-  if (byte_len(b) != i) {
-    ret false;
-  }
-  while (i > 0u) {
-    i -= 1u;
-    auto cha = a.(i);
-    auto chb = b.(i);
-    if (cha != chb) {
-      ret false;
+    let uint i = byte_len(a);
+    if (byte_len(b) != i) {
+        ret false;
+    }
+    while (i > 0u) {
+        i -= 1u;
+        auto cha = a.(i);
+        auto chb = b.(i);
+        if (cha != chb) {
+            ret false;
+        }
     }
-  }
-  ret true;
+    ret true;
 }
 
 fn hash(&str s) -> uint {
-  // djb hash.
-  // FIXME: replace with murmur.
-  let uint u = 5381u;
-  for (u8 c in s) {
-    u *= 33u;
-    u += (c as uint);
-  }
-  ret u;
+    // djb hash.
+    // FIXME: replace with murmur.
+    let uint u = 5381u;
+    for (u8 c in s) {
+        u *= 33u;
+        u += (c as uint);
+    }
+    ret u;
 }
 
 fn is_utf8(vec[u8] v) -> bool {
-  fail; // FIXME
+    fail; // FIXME
 }
 
 fn is_ascii(str s) -> bool {
-  let uint i = byte_len(s);
-  while (i > 0u) {
-    i -= 1u;
-    if ((s.(i) & 0x80u8) != 0u8) {
-      ret false;
+    let uint i = byte_len(s);
+    while (i > 0u) {
+        i -= 1u;
+        if ((s.(i) & 0x80u8) != 0u8) {
+            ret false;
+        }
     }
-  }
-  ret true;
+    ret true;
 }
 
 fn alloc(uint n_bytes) -> str {
-  ret rustrt.str_alloc(n_bytes);
+    ret rustrt.str_alloc(n_bytes);
 }
 
 // Returns the number of bytes (a.k.a. UTF-8 code units) in s.
@@ -63,159 +63,160 @@ fn alloc(uint n_bytes) -> str {
 // http://icu-project.org/apiref/icu4c/classBreakIterator.html for a
 // way to implement those.
 fn byte_len(str s) -> uint {
-  ret rustrt.str_byte_len(s);
+    ret rustrt.str_byte_len(s);
 }
 
 fn buf(str s) -> sbuf {
-  ret rustrt.str_buf(s);
+    ret rustrt.str_buf(s);
 }
 
 fn bytes(str s) -> vec[u8] {
-  /* FIXME (issue #58):
-   * Should be...
-   *
-   *  fn ith(str s, uint i) -> u8 {
-   *      ret s.(i);
-   *  }
-   *  ret _vec.init_fn[u8](bind ith(s, _), byte_len(s));
-   *
-   * but we do not correctly decrement refcount of s when
-   * the binding dies, so we have to do this manually.
-   */
-  let uint n = _str.byte_len(s);
-  let vec[u8] v = _vec.alloc[u8](n);
-  let uint i = 0u;
-  while (i < n) {
-    v += vec(s.(i));
-    i += 1u;
-  }
-  ret v;
+    /* FIXME (issue #58):
+     * Should be...
+     *
+     *  fn ith(str s, uint i) -> u8 {
+     *      ret s.(i);
+     *  }
+     *  ret _vec.init_fn[u8](bind ith(s, _), byte_len(s));
+     *
+     * but we do not correctly decrement refcount of s when
+     * the binding dies, so we have to do this manually.
+     */
+    let uint n = _str.byte_len(s);
+    let vec[u8] v = _vec.alloc[u8](n);
+    let uint i = 0u;
+    while (i < n) {
+        v += vec(s.(i));
+        i += 1u;
+    }
+    ret v;
 }
 
 fn from_bytes(vec[u8] v) : is_utf8(v) -> str {
-  ret rustrt.str_from_vec(v);
+    ret rustrt.str_from_vec(v);
 }
 
 fn refcount(str s) -> uint {
-  // -1 because calling this function incremented the refcount.
-  ret rustrt.refcount[u8](s) - 1u;
+    // -1 because calling this function incremented the refcount.
+    ret rustrt.refcount[u8](s) - 1u;
 }
 
 
 // Standard bits from the world of string libraries.
 
 fn index(str s, u8 c) -> int {
-  let int i = 0;
-  for (u8 k in s) {
-    if (k == c) {
-      ret i;
+    let int i = 0;
+    for (u8 k in s) {
+        if (k == c) {
+            ret i;
+        }
+        i += 1;
     }
-    i += 1;
-  }
-  ret -1;
+    ret -1;
 }
 
 fn rindex(str s, u8 c) -> int {
-  let int n = _str.byte_len(s) as int;
-  while (n >= 0) {
-    if (s.(n) == c) {
-      ret n;
+    let int n = _str.byte_len(s) as int;
+    while (n >= 0) {
+        if (s.(n) == c) {
+            ret n;
+        }
+        n -= 1;
     }
-    n -= 1;
-  }
-  ret n;
+    ret n;
 }
 
 fn find(str haystack, str needle) -> int {
 
-  let int haystack_len = byte_len(haystack) as int;
-  let int needle_len = byte_len(needle) as int;
+    let int haystack_len = byte_len(haystack) as int;
+    let int needle_len = byte_len(needle) as int;
 
-  if (needle_len == 0) {
-    ret 0;
-  }
+    if (needle_len == 0) {
+        ret 0;
+    }
 
-  fn match_at(&str haystack,
-              &str needle,
-              int i) -> bool {
-    let int j = i;
-    for (u8 c in needle) {
-      if (haystack.(j) != c) {
-        ret false;
-      }
-      j += 1;
+    fn match_at(&str haystack,
+                &str needle,
+                int i) -> bool {
+        let int j = i;
+        for (u8 c in needle) {
+            if (haystack.(j) != c) {
+                ret false;
+            }
+            j += 1;
+        }
+        ret true;
     }
-    ret true;
-  }
 
-  let int i = 0;
-  while (i <= haystack_len - needle_len) {
-    if (match_at(haystack, needle, i)) {
-      ret i;
+    let int i = 0;
+    while (i <= haystack_len - needle_len) {
+        if (match_at(haystack, needle, i)) {
+            ret i;
+        }
+        i += 1;
     }
-    i += 1;
-  }
-  ret  -1;
+    ret  -1;
 }
 
 fn substr(str s, uint begin, uint len) -> str {
-  let str accum = "";
-  let uint i = begin;
-  while (i < begin+len) {
-    accum += s.(i);
-    i += 1u;
-  }
-  ret accum;
+    let str accum = "";
+    let uint i = begin;
+    while (i < begin+len) {
+        accum += s.(i);
+        i += 1u;
+    }
+    ret accum;
 }
 
 fn split(str s, u8 sep) -> vec[str] {
-  let vec[str] v = vec();
-  let str accum = "";
-  let bool ends_with_sep = false;
-  for (u8 c in s) {
-    if (c == sep) {
-      v += accum;
-      accum = "";
-      ends_with_sep = true;
-    } else {
-      accum += c;
-      ends_with_sep = false;
+    let vec[str] v = vec();
+    let str accum = "";
+    let bool ends_with_sep = false;
+    for (u8 c in s) {
+        if (c == sep) {
+            v += accum;
+            accum = "";
+            ends_with_sep = true;
+        } else {
+            accum += c;
+            ends_with_sep = false;
+        }
+    }
+    if (_str.byte_len(accum) != 0u ||
+        ends_with_sep) {
+        v += accum;
     }
-  }
-  if (_str.byte_len(accum) != 0u ||
-      ends_with_sep) {
-    v += accum;
-  }
-  ret v;
+    ret v;
 }
 
 fn concat(vec[str] v) -> str {
-  let str s = "";
-  for (str ss in v) {
-    s += ss;
-  }
-  ret s;
+    let str s = "";
+    for (str ss in v) {
+        s += ss;
+    }
+    ret s;
 }
 
 fn connect(vec[str] v, str sep) -> str {
-  let str s = "";
-  let bool first = true;
-  for (str ss in v) {
-    if (first) {
-      first = false;
-    } else {
-      s += sep;
+    let str s = "";
+    let bool first = true;
+    for (str ss in v) {
+        if (first) {
+            first = false;
+        } else {
+            s += sep;
+        }
+        s += ss;
     }
-    s += ss;
-  }
-  ret s;
+    ret s;
 }
 
 
 // Local Variables:
 // mode: rust;
 // fill-column: 78;
 // indent-tabs-mode: nil
+// c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
 // compile-command: "make -k -C .. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End: