Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Finish migrating to serialization2 #3693

Merged
merged 2 commits into from Oct 8, 2012
Merged

Finish migrating to serialization2 #3693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb626e7
Remove the old serializers (needs snapshot)
erickt Oct 7, 2012
0bd6da8
Remove old auto_serialize2 code (needs snapshot)
erickt Oct 7, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
394 changes: 207 additions & 187 deletions src/libstd/ebml.rs
View file
Open in desktop

Large diffs are not rendered by default.

645 changes: 1 addition & 644 deletions src/libstd/ebml2.rs
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/libstd/json.rs
View file
Open in desktop
Expand Up @@ -63,7 +63,7 @@ pub fn Serializer(wr: io::Writer) -> Serializer {
Serializer { wr: wr }
}

pub impl Serializer: serialization2::Serializer {
pub impl Serializer: serialization::Serializer {
fn emit_nil(&self) { self.wr.write_str("null") }

fn emit_uint(&self, v: uint) { self.emit_float(v as float); }
Expand Down Expand Up @@ -167,7 +167,7 @@ pub fn PrettySerializer(wr: io::Writer) -> PrettySerializer {
PrettySerializer { wr: wr, indent: 0 }
}

pub impl PrettySerializer: serialization2::Serializer {
pub impl PrettySerializer: serialization::Serializer {
fn emit_nil(&self) { self.wr.write_str("null") }

fn emit_uint(&self, v: uint) { self.emit_float(v as float); }
Expand Down Expand Up @@ -273,8 +273,8 @@ pub impl PrettySerializer: serialization2::Serializer {
}
}

pub impl Json: serialization2::Serializable {
fn serialize<S: serialization2::Serializer>(&self, s: &S) {
pub impl Json: serialization::Serializable {
fn serialize<S: serialization::Serializer>(&self, s: &S) {
match *self {
Number(v) => v.serialize(s),
String(ref v) => v.serialize(s),
Expand Down Expand Up @@ -721,7 +721,7 @@ priv impl Deserializer {
}
}

pub impl Deserializer: serialization2::Deserializer {
pub impl Deserializer: serialization::Deserializer {
fn read_nil(&self) -> () {
debug!("read_nil");
match *self.pop() {
Expand Down
168 changes: 106 additions & 62 deletions src/libstd/prettyprint.rs
View file
Open in desktop
Expand Up @@ -2,131 +2,175 @@

use io::Writer;
use io::WriterUtil;
use serialization::Serializer;
use serialization;

impl Writer: Serializer {
fn emit_nil() {
self.write_str(~"()")
pub struct Serializer {
wr: io::Writer,
}

pub fn Serializer(wr: io::Writer) -> Serializer {
Serializer { wr: wr }
}

pub impl Serializer: serialization::Serializer {
fn emit_nil(&self) {
self.wr.write_str(~"()")
}

fn emit_uint(&self, v: uint) {
self.wr.write_str(fmt!("%?u", v));
}

fn emit_u64(&self, v: u64) {
self.wr.write_str(fmt!("%?_u64", v));
}

fn emit_u32(&self, v: u32) {
self.wr.write_str(fmt!("%?_u32", v));
}

fn emit_u16(&self, v: u16) {
self.wr.write_str(fmt!("%?_u16", v));
}

fn emit_u8(&self, v: u8) {
self.wr.write_str(fmt!("%?_u8", v));
}

fn emit_uint(v: uint) {
self.write_str(fmt!("%?u", v));
fn emit_int(&self, v: int) {
self.wr.write_str(fmt!("%?", v));
}

fn emit_u64(v: u64) {
self.write_str(fmt!("%?_u64", v));
fn emit_i64(&self, v: i64) {
self.wr.write_str(fmt!("%?_i64", v));
}

fn emit_u32(v: u32) {
self.write_str(fmt!("%?_u32", v));
fn emit_i32(&self, v: i32) {
self.wr.write_str(fmt!("%?_i32", v));
}

fn emit_u16(v: u16) {
self.write_str(fmt!("%?_u16", v));
fn emit_i16(&self, v: i16) {
self.wr.write_str(fmt!("%?_i16", v));
}

fn emit_u8(v: u8) {
self.write_str(fmt!("%?_u8", v));
fn emit_i8(&self, v: i8) {
self.wr.write_str(fmt!("%?_i8", v));
}

fn emit_int(v: int) {
self.write_str(fmt!("%?", v));
fn emit_bool(&self, v: bool) {
self.wr.write_str(fmt!("%b", v));
}

fn emit_i64(v: i64) {
self.write_str(fmt!("%?_i64", v));
fn emit_float(&self, v: float) {
self.wr.write_str(fmt!("%?_f", v));
}

fn emit_i32(v: i32) {
self.write_str(fmt!("%?_i32", v));
fn emit_f64(&self, v: f64) {
self.wr.write_str(fmt!("%?_f64", v));
}

fn emit_i16(v: i16) {
self.write_str(fmt!("%?_i16", v));
fn emit_f32(&self, v: f32) {
self.wr.write_str(fmt!("%?_f32", v));
}

fn emit_i8(v: i8) {
self.write_str(fmt!("%?_i8", v));
fn emit_char(&self, v: char) {
self.wr.write_str(fmt!("%?", v));
}

fn emit_bool(v: bool) {
self.write_str(fmt!("%b", v));
fn emit_borrowed_str(&self, v: &str) {
self.wr.write_str(fmt!("&%?", v));
}

fn emit_float(v: float) {
self.write_str(fmt!("%?_f", v));
fn emit_owned_str(&self, v: &str) {
self.wr.write_str(fmt!("~%?", v));
}

fn emit_f64(v: f64) {
self.write_str(fmt!("%?_f64", v));
fn emit_managed_str(&self, v: &str) {
self.wr.write_str(fmt!("@%?", v));
}

fn emit_f32(v: f32) {
self.write_str(fmt!("%?_f32", v));
fn emit_borrowed(&self, f: fn()) {
self.wr.write_str(~"&");
f();
}

fn emit_str(v: &str) {
self.write_str(fmt!("%?", v));
fn emit_owned(&self, f: fn()) {
self.wr.write_str(~"~");
f();
}

fn emit_managed(&self, f: fn()) {
self.wr.write_str(~"@");
f();
}

fn emit_enum(&self, _name: &str, f: fn()) {
f();
}

fn emit_enum(_name: &str, f: fn()) {
fn emit_enum_variant(&self, v_name: &str, _v_id: uint, sz: uint,
f: fn()) {
self.wr.write_str(v_name);
if sz > 0u { self.wr.write_str(~"("); }
f();
if sz > 0u { self.wr.write_str(~")"); }
}

fn emit_enum_variant(v_name: &str, _v_id: uint, sz: uint, f: fn()) {
self.write_str(v_name);
if sz > 0u { self.write_str(~"("); }
fn emit_enum_variant_arg(&self, idx: uint, f: fn()) {
if idx > 0u { self.wr.write_str(~", "); }
f();
if sz > 0u { self.write_str(~")"); }
}

fn emit_enum_variant_arg(idx: uint, f: fn()) {
if idx > 0u { self.write_str(~", "); }
fn emit_borrowed_vec(&self, _len: uint, f: fn()) {
self.wr.write_str(~"&[");
f();
self.wr.write_str(~"]");
}

fn emit_vec(_len: uint, f: fn()) {
self.write_str(~"[");
fn emit_owned_vec(&self, _len: uint, f: fn()) {
self.wr.write_str(~"~[");
f();
self.write_str(~"]");
self.wr.write_str(~"]");
}

fn emit_vec_elt(idx: uint, f: fn()) {
if idx > 0u { self.write_str(~", "); }
fn emit_managed_vec(&self, _len: uint, f: fn()) {
self.wr.write_str(~"@[");
f();
self.wr.write_str(~"]");
}

fn emit_box(f: fn()) {
self.write_str(~"@");
fn emit_vec_elt(&self, idx: uint, f: fn()) {
if idx > 0u { self.wr.write_str(~", "); }
f();
}

fn emit_uniq(f: fn()) {
self.write_str(~"~");
fn emit_rec(&self, f: fn()) {
self.wr.write_str(~"{");
f();
self.wr.write_str(~"}");
}

fn emit_rec(f: fn()) {
self.write_str(~"{");
fn emit_struct(&self, name: &str, f: fn()) {
self.wr.write_str(fmt!("%s {", name));
f();
self.write_str(~"}");
self.wr.write_str(~"}");
}

fn emit_rec_field(f_name: &str, f_idx: uint, f: fn()) {
if f_idx > 0u { self.write_str(~", "); }
self.write_str(f_name);
self.write_str(~": ");
fn emit_field(&self, name: &str, idx: uint, f: fn()) {
if idx > 0u { self.wr.write_str(~", "); }
self.wr.write_str(name);
self.wr.write_str(~": ");
f();
}

fn emit_tup(_sz: uint, f: fn()) {
self.write_str(~"(");
fn emit_tup(&self, _len: uint, f: fn()) {
self.wr.write_str(~"(");
f();
self.write_str(~")");
self.wr.write_str(~")");
}

fn emit_tup_elt(idx: uint, f: fn()) {
if idx > 0u { self.write_str(~", "); }
fn emit_tup_elt(&self, idx: uint, f: fn()) {
if idx > 0u { self.wr.write_str(~", "); }
f();
}
}