eryn/sibil
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename Identifier expression just Id

Browse source
This commit is contained in:
Eryn Wells 2017-01-16 16:18:57 -08:00
parent 8e25c7e521
commit 61d98ff135
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/parser/mod.rs
View file

@ -100,7 +100,7 @@ mod tests {
#[test] #[test]
fn parses_single_expression() { fn parses_single_expression() {
let r = parse("(a)"); let r = parse("(a)");
let list = list("(", vec![Box::new(Expression::Identifier("a".to_string()))], ")"); let list = list("(", vec![Box::new(Expression::Id("a".to_string()))], ")");
assert_eq!(r.unwrap(), Program::new(vec![list, Expression::EOF])); assert_eq!(r.unwrap(), Program::new(vec![list, Expression::EOF]));
} }

10
src/parser/nodes.rs
View file

@ -21,7 +21,7 @@ impl Program {
pub enum Expression { pub enum Expression {
EOF, EOF,
Identifier(String), Id(String),
Literal(Box<types::Value>), Literal(Box<types::Value>),
List { left: Token, expr: Vec<Box<Expression>>, right: Token }, List { left: Token, expr: Vec<Box<Expression>>, right: Token },
} }
@ -30,7 +30,7 @@ impl fmt::Debug for Expression {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self { match *self {
Expression::EOF => write!(f, "EOF"), Expression::EOF => write!(f, "EOF"),
Expression::Identifier(ref id) => write!(f, "Id{{{:?}}}", id), Expression::Id(ref id) => write!(f, "Id{{{:?}}}", id),
Expression::Literal(ref value) => write!(f, "Literal{{{:?}}}", value), Expression::Literal(ref value) => write!(f, "Literal{{{:?}}}", value),
Expression::List{ left: ref lt, ref expr, right: ref rt } => { Expression::List{ left: ref lt, ref expr, right: ref rt } => {
write!(f, "{:?} {:?} {:?}", lt, expr, rt) write!(f, "{:?} {:?} {:?}", lt, expr, rt)
@ -43,7 +43,7 @@ impl PartialEq for Expression {
fn eq(&self, other: &Expression) -> bool { fn eq(&self, other: &Expression) -> bool {
match *self { match *self {
Expression::EOF => self.eq_eof(other), Expression::EOF => self.eq_eof(other),
Expression::Identifier(ref id) => self.eq_identifier(other, id), Expression::Id(ref id) => self.eq_id(other, id),
Expression::Literal(ref value) => self.eq_literal(other, value.deref()), Expression::Literal(ref value) => self.eq_literal(other, value.deref()),
Expression::List { ref left, ref expr, ref right } => { Expression::List { ref left, ref expr, ref right } => {
self.eq_list(other, left, expr, right) self.eq_list(other, left, expr, right)
@ -60,9 +60,9 @@ impl Expression {
} }
} }
fn eq_identifier(&self, other: &Expression, id: &str) -> bool { fn eq_id(&self, other: &Expression, id: &str) -> bool {
match *other { match *other {
Expression::Identifier(ref oid) => id == oid, Expression::Id(ref oid) => id == oid,
_ => false, _ => false,
} }
} }