bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

json: add "null"

Browse source
This commit is contained in:
Lenny222 2011-12-21 21:36:43 +01:00 • committed by Marijn Haverbeke
parent 7bf12f3723
commit 6f5a0a3b3b
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libstd/json.rs
View file

@ -34,6 +34,8 @@ tag json {
list(@[json]);
/* Variant: dict */
dict(map::hashmap<str,json>);
/* Variant: null */
null;
}
/*
@ -233,6 +235,14 @@ fn from_str_bool(s: str) -> (option::t<json>, str) {
}
}
fn from_str_null(s: str) -> (option::t<json>, str) {
if (str::starts_with(s, "null")) {
(some(null), str::slice(s, 4u, str::byte_len(s)))
} else {
(none, s)
}
}
fn from_str_helper(s: str) -> (option::t<json>, str) {
let s = str::trim_left(s);
if str::is_empty(s) { ret (none, s); }
@ -243,6 +253,7 @@ fn from_str_helper(s: str) -> (option::t<json>, str) {
'{' { from_str_dict(s) }
'0' to '9' | '-' | '+' | '.' { from_str_float(s) }
't' | 'f' { from_str_bool(s) }
'n' { from_str_null(s) }
_ { ret (none, s); }
}
}