From d3207ad890cca72b3b3915d8795b08b33f6f9770 Mon Sep 17 00:00:00 2001
From: greg <greg.shuflin@protonmail.com>
Date: Thu, 21 Jan 2016 00:54:54 -0800
Subject: [PATCH] Move evaluation logic back into methods

They need to be able to access the environment which is stored in the
Evalator struct
---
 src/eval.rs | 58 +++++++++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/eval.rs b/src/eval.rs
index 0098fde..6bc9016 100644
--- a/src/eval.rs
+++ b/src/eval.rs
@@ -37,14 +37,10 @@ impl Evaluator {
 }
 
 trait Evaluable {
-    type Output;
     fn is_reducible(&self) -> bool;
-    fn reduce(self) -> Self::Output;
 }
 
 impl Evaluable for ASTNode {
-    type Output = ASTNode;
-
     fn is_reducible(&self) -> bool {
         use parser::ASTNode::*;
         match self {
@@ -52,25 +48,9 @@ impl Evaluable for ASTNode {
             _ => unimplemented!(),
         }
     }
-
-    fn reduce(self) -> Self::Output {
-        use parser::ASTNode::*;
-        match self {
-            ExprNode(expr) => {
-                if expr.is_reducible() {
-                    ExprNode(expr.reduce())
-                } else {
-                    ExprNode(expr)
-                }
-            },
-            _ => unimplemented!(),
-        }
-    }
 }
 
 impl Evaluable for Expression {
-    type Output = Expression;
-
     fn is_reducible(&self) -> bool {
         use parser::Expression::*;
         match *self {
@@ -79,16 +59,6 @@ impl Evaluable for Expression {
             _ => true,
         }
     }
-
-    fn reduce(self) -> Self::Output {
-        use parser::Expression::*;
-        match self {
-            e@StringLiteral(_) => e,
-            e@Number(_) => e,
-            Variable(var) => Number(20.0),
-            _ => unimplemented!(),
-        }
-    }
 }
 
 impl Evaluator {
@@ -105,6 +75,32 @@ impl Evaluator {
 
     fn step(&mut self, node: ASTNode) -> ASTNode {
         println!("Doing one step, current node is {:?}", node);
-        node.reduce()
+        self.reduce(node)
+    }
+
+    fn reduce(&mut self, node: ASTNode) -> ASTNode {
+        use parser::ASTNode::*;
+        match node {
+            ExprNode(expr) => {
+                if expr.is_reducible() {
+                    ExprNode(self.reduce_expr(expr))
+                } else {
+                    ExprNode(expr)
+                }
+            },
+            _ => unimplemented!(),
+        }
+    }
+
+    fn reduce_expr(&mut self, expression: Expression) -> Expression {
+        use parser::Expression::*;
+        match expression {
+            e@StringLiteral(_) => e,
+            e@Number(_) => e,
+            Variable(var) => Number(20.0),
+            _ => unimplemented!(),
+        }
+
+
     }
 }