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

Add concept of Null expression

Browse Source 
Finally, the null-only behavior is starting to manifest itself!
This commit is contained in:
greg 2016-01-21 19:12:07 -08:00
parent 15d4317191
commit e9dd0d9ae8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/eval.rs
View File

@ -56,6 +56,7 @@ impl Evaluable for Expression {
fn is_reducible(&self) -> bool { fn is_reducible(&self) -> bool {
use parser::Expression::*; use parser::Expression::*;
match *self { match *self {
Null => false,
StringLiteral(_) => false, StringLiteral(_) => false,
Number(_) => false, Number(_) => false,
_ => true, _ => true,
@ -123,11 +124,11 @@ impl Evaluator {
match &op[..] { match &op[..] {
"+" => match (left, right) { "+" => match (left, right) {
(Number(l), Number(r)) => Number(l + r), (Number(l), Number(r)) => Number(l + r),
_ => unimplemented!(), _ => Null,
}, },
"-" => match (left, right) { "-" => match (left, right) {
(Number(l), Number(r)) => Number(l - r), (Number(l), Number(r)) => Number(l - r),
_ => unimplemented!(), _ => Null,
}, },
"=" => match (left, right) { "=" => match (left, right) {
_ => unimplemented!() _ => unimplemented!()