azur/bobbylisp
1
1
Fork 0
mirror of https://github.com/azur1s/bobbylisp.git synced 2024-10-16 02:37:40 -05:00
Code Issues Projects Releases Wiki Activity

fix: better list & vector fmt

Browse source
This commit is contained in:
Natapat Samutpong 2022-01-22 06:53:56 +07:00
parent af2299e78f
commit c03ec9e5f4
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main.rs
View file

@ -23,7 +23,9 @@ fn main() {
// Everything is in a List(..) so we need to get it out and make it into // Everything is in a List(..) so we need to get it out and make it into
// a vector of Expr instead, so we can compile it. // a vector of Expr instead, so we can compile it.
let a = util::unwrap_list_nest(ast.unwrap()); let a = util::unwrap_list_nest(ast.unwrap());
println!("{:#?}", a); for e in a.iter() {
println!("{}", e);
}
// TODO: compile to something else.. // TODO: compile to something else..
} }
} }

18
src/token.rs
View file

@ -20,22 +20,10 @@ impl std::fmt::Display for Expr {
Expr::Null => write!(f, "Null"), Expr::Null => write!(f, "Null"),
Expr::Bool(b) => write!(f, "{}", b), Expr::Bool(b) => write!(f, "{}", b),
Expr::Number(n) => write!(f, "{}", n), Expr::Number(n) => write!(f, "{}", n),
Expr::String(s) => write!(f, "{}", unescape(s.to_string())), Expr::String(s) => write!(f, "\"{}\"", unescape(s.to_string())),
Expr::Symbol(s) => write!(f, "{}", s), Expr::Symbol(s) => write!(f, "{}", s),
Expr::List(l, _) => { Expr::List(l, _) => write!(f, "({})", l.iter().map(|e| format!("{}", e)).collect::<Vec<String>>().join(" ")),
write!(f, "(")?; Expr::Vector(l, _) => write!(f, "[{}]", l.iter().map(|e| format!("{}", e)).collect::<Vec<String>>().join(", ")),
for e in l.iter() {
write!(f, "{}", e)?;
}
write!(f, ")")
}
Expr::Vector(l, _) => {
write!(f, "[")?;
for e in l.iter() {
write!(f, "{}", e)?;
}
write!(f, "]")
}
} }
} }
} }