greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make tests pass w/ new match syntax

Browse Source
This commit is contained in:
greg 2016-12-28 19:46:06 -08:00
parent fe8418edbe
commit 17f9846bb9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/parser.rs
View File

@ -355,16 +355,16 @@ mod tests {
parsetest!( parsetest!(
"fn a() 1 + 2 end", "fn a() 1 + 2 end",
[FuncNode(Function {prototype: Prototype { name: ref name, args: ref args }, body: ref body})], &[FuncNode(Function {prototype: Prototype { name: ref name, parameters: ref parameters }, body: ref body})],
match &body[..] { [BinExp(_, box Number(1.0), box Number(2.0))] => true, _ => false } match &body[..] { &[BinExp(_, box Number(1.0), box Number(2.0))] => true, _ => false }
&& name == "a" && match &args[..] { [] => true, _ => false } && name == "a" && match &parameters[..] { &[] => true, _ => false }
); );
parsetest!( parsetest!(
"fn a(x,y) 1 + 2 end", "fn a(x,y) 1 + 2 end",
[FuncNode(Function {prototype: Prototype { name: ref name, args: ref args }, body: ref body})], &[FuncNode(Function {prototype: Prototype { name: ref name, parameters: ref parameters }, body: ref body})],
match &body[..] { [BinExp(_, box Number(1.0), box Number(2.0))] => true, _ => false } match &body[..] { &[BinExp(_, box Number(1.0), box Number(2.0))] => true, _ => false }
&& name == "a" && *args == ["x","y"] && name == "a" && *parameters == ["x","y"]
); );
} }
@ -372,18 +372,18 @@ mod tests {
fn expression_parse_test() { fn expression_parse_test() {
use super::ASTNode::*; use super::ASTNode::*;
use super::Expression::*; use super::Expression::*;
parsetest!("a", [ExprNode(Variable(ref s))], s == "a"); parsetest!("a", &[ExprNode(Variable(ref s))], s == "a");
parsetest!("a + b", parsetest!("a + b",
[ExprNode(BinExp(ref plus, box Variable(ref a), box Variable(ref b)))], &[ExprNode(BinExp(ref plus, box Variable(ref a), box Variable(ref b)))],
plus == "+" && a == "a" && b == "b"); plus == "+" && a == "a" && b == "b");
parsetest!("a + b * c", parsetest!("a + b * c",
[ExprNode(BinExp(ref plus, box Variable(ref a), box BinExp(ref mul, box Variable(ref b), box Variable(ref c))))], &[ExprNode(BinExp(ref plus, box Variable(ref a), box BinExp(ref mul, box Variable(ref b), box Variable(ref c))))],
plus == "+" && mul == "*" && a == "a" && b == "b" && c == "c"); plus == "+" && mul == "*" && a == "a" && b == "b" && c == "c");
parsetest!("a * b + c", parsetest!("a * b + c",
[ExprNode(BinExp(ref plus, box BinExp(ref mul, box Variable(ref a), box Variable(ref b)), box Variable(ref c)))], &[ExprNode(BinExp(ref plus, box BinExp(ref mul, box Variable(ref a), box Variable(ref b)), box Variable(ref c)))],
plus == "+" && mul == "*" && a == "a" && b == "b" && c == "c"); plus == "+" && mul == "*" && a == "a" && b == "b" && c == "c");
parsetest!("(a + b) * c", parsetest!("(a + b) * c",
[ExprNode(BinExp(ref mul, box BinExp(ref plus, box Variable(ref a), box Variable(ref b)), box Variable(ref c)))], &[ExprNode(BinExp(ref mul, box BinExp(ref plus, box Variable(ref a), box Variable(ref b)), box Variable(ref c)))],
plus == "+" && mul == "*" && a == "a" && b == "b" && c == "c"); plus == "+" && mul == "*" && a == "a" && b == "b" && c == "c");
} }
} }