bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

syntax: add {read,emit}_enum_struct_variant{,_field}

Browse source
This commit is contained in:
Erick Tryzelaar 2013-04-09 19:45:10 -07:00
parent e31f7b7c74
commit f3ab67ec5f
4 changed files with 75 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/libstd/json.rs
View file

@ -109,6 +109,7 @@ impl serialize::Encoder for Encoder {
fn emit_str(&self, v: &str) { self.wr.write_str(escape_str(v)) }
fn emit_enum(&self, _name: &str, f: &fn()) { f() }
fn emit_enum_variant(&self, name: &str, _id: uint, cnt: uint, f: &fn()) {
// enums are encoded as strings or vectors:
// Bunny => "Bunny"
@ -126,10 +127,18 @@ impl serialize::Encoder for Encoder {
}
fn emit_enum_variant_arg(&self, idx: uint, f: &fn()) {
if (idx != 0) {self.wr.write_char(',');}
if idx != 0 {self.wr.write_char(',');}
f();
}
fn emit_enum_struct_variant(&self, name: &str, id: uint, cnt: uint, f: &fn()) {
self.emit_enum_variant(name, id, cnt, f)
}
fn emit_enum_struct_variant_field(&self, _field: &str, idx: uint, f: &fn()) {
self.emit_enum_variant_arg(idx, f)
}
fn emit_struct(&self, _name: &str, _len: uint, f: &fn()) {
self.wr.write_char('{');
f();
@ -232,6 +241,7 @@ impl serialize::Encoder for PrettyEncoder {
fn emit_str(&self, v: &str) { self.wr.write_str(escape_str(v)); }
fn emit_enum(&self, _name: &str, f: &fn()) { f() }
fn emit_enum_variant(&self, name: &str, _id: uint, cnt: uint, f: &fn()) {
if cnt == 0 {
self.wr.write_str(escape_str(name));
@ -249,6 +259,7 @@ impl serialize::Encoder for PrettyEncoder {
self.wr.write_char(']');
}
}
fn emit_enum_variant_arg(&self, idx: uint, f: &fn()) {
if idx != 0 {
self.wr.write_str(",\n");
@ -257,6 +268,15 @@ impl serialize::Encoder for PrettyEncoder {
f()
}
fn emit_enum_struct_variant(&self, name: &str, id: uint, cnt: uint, f: &fn()) {
self.emit_enum_variant(name, id, cnt, f)
}
fn emit_enum_struct_variant_field(&self, _field: &str, idx: uint, f: &fn()) {
self.emit_enum_variant_arg(idx, f)
}
fn emit_struct(&self, _name: &str, len: uint, f: &fn()) {
if len == 0 {
self.wr.write_str("{}");
@ -864,6 +884,17 @@ impl serialize::Decoder for Decoder {
f()
}
fn read_enum_struct_variant<T>(&self, names: &[&str], f: &fn(uint) -> T) -> T {
debug!("read_enum_struct_variant(names=%?)", names);
self.read_enum_variant(names, f)
}
fn read_enum_struct_variant_field<T>(&self, name: &str, idx: uint, f: &fn() -> T) -> T {
debug!("read_enum_struct_variant_field(name=%?, idx=%u)", name, idx);
self.read_enum_variant_arg(idx, f)
}
fn read_struct<T>(&self, name: &str, len: uint, f: &fn() -> T) -> T {
debug!("read_struct(name=%s, len=%u)", name, len);
let value = f();