mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert str::from_chars, to_chars to ivecs

Browse Source
This commit is contained in:
Brian Anderson 2011-08-11 17:19:01 -07:00
parent 878fbac278
commit cfb9cba19f
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/str.rs
View File

@ -241,7 +241,7 @@ fn from_char(ch: char) -> str {
ret buf;
}
fn from_chars(chs: vec[char]) -> str {
fn from_chars(chs: &[char]) -> str {
let buf = "";
for ch: char in chs { push_utf8_bytes(buf, ch); }
ret buf;
@ -300,13 +300,13 @@ fn char_len(s: str) -> uint {
ret len;
}
fn to_chars(s: str) -> vec[char] {
let buf: vec[char] = [];
fn to_chars(s: str) -> [char] {
let buf: [char] = ~[];
let i = 0u;
let len = byte_len(s);
while i < len {
let cur = char_range_at(s, i);
vec::push[char](buf, cur.ch);
buf += ~[cur.ch];
i = cur.next;
}
ret buf;
@ -524,13 +524,13 @@ fn replace(s: str, from: str, to: str) : is_not_empty(from) -> str {
// FIXME: Also not efficient
fn char_slice(s: &str, begin: uint, end: uint) -> str {
from_chars(vec::slice(to_chars(s), begin, end))
from_chars(ivec::slice(to_chars(s), begin, end))
}
fn trim_left(s: &str) -> str {
fn count_whities(s: &vec[char]) -> uint {
fn count_whities(s: &[char]) -> uint {
let i = 0u;
while i < vec::len(s) {
while i < ivec::len(s) {
if !char::is_whitespace(s.(i)) {
break;
}
@ -540,12 +540,12 @@ fn trim_left(s: &str) -> str {
}
let chars = to_chars(s);
let whities = count_whities(chars);
ret from_chars(vec::slice(chars, whities, vec::len(chars)));
ret from_chars(ivec::slice(chars, whities, ivec::len(chars)));
}
fn trim_right(s: &str) -> str {
fn count_whities(s: &vec[char]) -> uint {
let i = vec::len(s);
fn count_whities(s: &[char]) -> uint {
let i = ivec::len(s);
while 0u < i {
if !char::is_whitespace(s.(i - 1u)) {
break;
@ -556,7 +556,7 @@ fn trim_right(s: &str) -> str {
}
let chars = to_chars(s);
let whities = count_whities(chars);
ret from_chars(vec::slice(chars, 0u, whities));
ret from_chars(ivec::slice(chars, 0u, whities));
}
fn trim(s: &str) -> str {

5
src/test/run-pass/utf8_chars.rs
View File

@ -1,17 +1,16 @@
use std;
import std::str;
import std::vec;
import std::io;
import std::ivec;
fn main() {
// Chars of 1, 2, 3, and 4 bytes
let chs: vec[char] = ['e', 'é', '€', 0x10000 as char];
let chs: [char] = ~['e', 'é', '€', 0x10000 as char];
let s: str = str::from_chars(chs);
assert (str::byte_len(s) == 10u);
assert (str::char_len(s) == 4u);
assert (vec::len[char](str::to_chars(s)) == 4u);
assert (ivec::len[char](str::to_chars(s)) == 4u);
assert (str::eq(str::from_chars(str::to_chars(s)), s));
assert (str::char_at(s, 0u) == 'e');
assert (str::char_at(s, 1u) == 'é');