From b1f9e5cefcf1c95d2a496e4712ca8a070e4422b9 Mon Sep 17 00:00:00 2001 From: greg Date: Fri, 22 Jan 2016 02:59:33 -0800 Subject: [PATCH] Fix variable lookup --- src/eval.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/eval.rs b/src/eval.rs index 7bd90c1..78eff18 100644 --- a/src/eval.rs +++ b/src/eval.rs @@ -101,8 +101,10 @@ impl Evaluator { e@StringLiteral(_) => e, e@Number(_) => e, Variable(var) => { - let expr = self.varmap.lookup_binding(var).unwrap(); - expr.clone() + match self.varmap.lookup_binding(var) { + None => Null, + Some(expr) => expr.clone() + } }, BinExp(op, box left, box right) => { if right.is_reducible() {