bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

(core::str) rename byte_len -> len_bytes and rename char_len -> len

Browse source
This commit is contained in:
Kevin Cantu 2012-02-12 00:14:05 -08:00
parent 944f5a6598
commit 2b4f5136a5
34 changed files with 123 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/libstd/json.rs
View file

@ -70,13 +70,13 @@ fn to_str(j: json) -> str {
}
fn rest(s: str) -> str {
assert(str::char_len(s) >= 1u);
str::slice(s, 1u, str::char_len(s))
assert(str::len(s) >= 1u);
str::slice(s, 1u, str::len(s))
}
fn from_str_str(s: str) -> (option<json>, str) {
let pos = 0u;
let len = str::byte_len(s);
let len = str::len_bytes(s);
let escape = false;
let res = "";
@ -99,7 +99,7 @@ fn from_str_str(s: str) -> (option<json>, str) {
cont;
} else if (c == '"') {
ret (some(string(res)),
str::slice(s, pos, str::char_len(s)));
str::slice(s, pos, str::len(s)));
}
res = res + str::from_char(c);
}
@ -172,7 +172,7 @@ fn from_str_dict(s: str) -> (option<json>, str) {
fn from_str_float(s: str) -> (option<json>, str) {
let pos = 0u;
let len = str::byte_len(s);
let len = str::len_bytes(s);
let res = 0f;
let neg = 1f;
@ -200,12 +200,12 @@ fn from_str_float(s: str) -> (option<json>, str) {
}
'.' { break; }
_ { ret (some(num(neg * res)),
str::slice(s, opos, str::char_len(s))); }
str::slice(s, opos, str::len(s))); }
}
}
if pos == len {
ret (some(num(neg * res)), str::slice(s, pos, str::char_len(s)));
ret (some(num(neg * res)), str::slice(s, pos, str::len(s)));
}
let dec = 1f;
@ -220,17 +220,17 @@ fn from_str_float(s: str) -> (option<json>, str) {
res += (((c as int) - ('0' as int)) as float) * dec;
}
_ { ret (some(num(neg * res)),
str::slice(s, opos, str::char_len(s))); }
str::slice(s, opos, str::len(s))); }
}
}
ret (some(num(neg * res)), str::slice(s, pos, str::char_len(s)));
ret (some(num(neg * res)), str::slice(s, pos, str::len(s)));
}
fn from_str_bool(s: str) -> (option<json>, str) {
if (str::starts_with(s, "true")) {
(some(boolean(true)), str::slice(s, 4u, str::char_len(s)))
(some(boolean(true)), str::slice(s, 4u, str::len(s)))
} else if (str::starts_with(s, "false")) {
(some(boolean(false)), str::slice(s, 5u, str::char_len(s)))
(some(boolean(false)), str::slice(s, 5u, str::len(s)))
} else {
(none, s)
}
@ -238,7 +238,7 @@ fn from_str_bool(s: str) -> (option<json>, str) {
fn from_str_null(s: str) -> (option<json>, str) {
if (str::starts_with(s, "null")) {
(some(null), str::slice(s, 4u, str::char_len(s)))
(some(null), str::slice(s, 4u, str::len(s)))
} else {
(none, s)
}