greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Packages Projects Releases 9 Wiki Activity

Handle more edn::Value types for printing, precursor for #195

Browse source 
Signed-off-by: Victor Porof <vporof@mozilla.com>
This commit is contained in:
Victor Porof 2017-02-02 16:48:03 +01:00
parent 2ecda0a2bd
commit 9a5ece8c89
1 changed files with 56 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
edn/src/types.rs
View file

@ -46,32 +46,48 @@ pub enum Value {
use self::Value::*; use self::Value::*;
impl Display for Value { impl Display for Value {
// TODO: Make sure float syntax is correct, handle NaN and escaping.
// See https://github.com/mozilla/mentat/issues/232
fn fmt(&self, f: &mut Formatter) -> ::std::fmt::Result { fn fmt(&self, f: &mut Formatter) -> ::std::fmt::Result {
match *self { match *self {
Keyword(ref v) => v.fmt(f), Nil => write!(f, "null"),
NamespacedKeyword(ref v) => v.fmt(f), Boolean(v) => write!(f, "{}", v),
PlainSymbol(ref v) => v.fmt(f),
NamespacedSymbol(ref v) => v.fmt(f),
Integer(v) => write!(f, "{}", v), Integer(v) => write!(f, "{}", v),
BigInteger(ref v) => write!(f, "{}N", v), BigInteger(ref v) => write!(f, "{}N", v),
Float(OrderedFloat(v)) => write!(f, "{}", v), // TODO: make sure float syntax is correct. Float(OrderedFloat(v)) => write!(f, "{}", v),
// TODO: NaN. Text(ref v) => write!(f, "{}", v),
Text(ref v) => write!(f, "{}", v), // TODO: EDN escaping. PlainSymbol(ref v) => v.fmt(f),
NamespacedSymbol(ref v) => v.fmt(f),
Keyword(ref v) => v.fmt(f),
NamespacedKeyword(ref v) => v.fmt(f),
Vector(ref v) => { Vector(ref v) => {
try!(write!(f, "[")); write!(f, "[")?;
for x in v { for x in v {
try!(write!(f, " {}", x)); write!(f, " {}", x)?;
} }
write!(f, " ]") write!(f, " ]")
} }
_ => List(ref v) => {
write!(f, "{}", write!(f, "(")?;
match *self { for x in v {
Nil => "null", write!(f, " {}", x)?;
Boolean(b) => if b { "true" } else { "false" }, }
_ => unimplemented!(), write!(f, " )")
}), }
Set(ref v) => {
write!(f, "#{{")?;
for x in v {
write!(f, " {}", x)?;
}
write!(f, " }}")
}
Map(ref v) => {
write!(f, "{{")?;
for (key, val) in v {
write!(f, " :{} {}", key, val)?;
}
write!(f, " }}")
}
} }
} }
} }
@ -264,16 +280,29 @@ mod test {
#[test] #[test]
fn test_print_edn() { fn test_print_edn() {
assert_eq!("[ 1 2 [ 3.14 ] [ ] :five :six/seven eight nine/ten true ]", assert_eq!("[ 1 2 ( 3.14 ) #{ 4N } { :foo/bar 42 } [ ] :five :six/seven eight nine/ten true false null ]",
Value::Vector(vec!(Value::Integer(1), Value::Vector(vec![
Value::Integer(2), Value::Integer(1),
Value::Vector(vec!(Value::Float(OrderedFloat(3.14)))), Value::Integer(2),
Value::Vector(vec!()), Value::List(LinkedList::from_iter(vec![
Value::Keyword(symbols::Keyword::new("five")), Value::Float(OrderedFloat(3.14))
Value::NamespacedKeyword(symbols::NamespacedKeyword::new("six", "seven")), ])),
Value::PlainSymbol(symbols::PlainSymbol::new("eight")), Value::Set(BTreeSet::from_iter(vec![
Value::NamespacedSymbol(symbols::NamespacedSymbol::new("nine", "ten")), Value::from_bigint("4").unwrap()
Value::Boolean(true))).to_string()); ])),
Value::Map(BTreeMap::from_iter(vec![
(Value::from_symbol("foo", "bar"), Value::Integer(42))
])),
Value::Vector(vec![]),
Value::Keyword(symbols::Keyword::new("five")),
Value::NamespacedKeyword(symbols::NamespacedKeyword::new("six", "seven")),
Value::PlainSymbol(symbols::PlainSymbol::new("eight")),
Value::NamespacedSymbol(symbols::NamespacedSymbol::new("nine", "ten")),
Value::Boolean(true),
Value::Boolean(false),
Value::Nil
]
).to_string());
} }
#[test] #[test]