From 2bb55b6cca2eba27334d17068f424456f24381b7 Mon Sep 17 00:00:00 2001
From: greg <greg.shuflin@protonmail.com>
Date: Sun, 3 Dec 2017 22:10:19 -0800
Subject: [PATCH] State for eval

---
 src/rukka_lang/mod.rs | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/rukka_lang/mod.rs b/src/rukka_lang/mod.rs
index 6659e3c..2ed6d62 100644
--- a/src/rukka_lang/mod.rs
+++ b/src/rukka_lang/mod.rs
@@ -4,10 +4,14 @@ use std::iter::Peekable;
 use std::vec::IntoIter;
 use std::str::Chars;
 
-pub struct Rukka { }
+pub struct EvaluatorState { }
+
+pub struct Rukka { 
+  state: EvaluatorState
+}
 
 impl Rukka {
-  pub fn new() -> Rukka { Rukka { } }
+  pub fn new() -> Rukka { Rukka { state: EvaluatorState::new() } }
 }
 
 impl ProgrammingLanguageInterface for Rukka {
@@ -30,7 +34,7 @@ impl ProgrammingLanguageInterface for Rukka {
     };
 
     let output_str: String = sexps.into_iter().enumerate().map(|(i, sexp)| {
-      match eval(sexp) {
+      match self.state.eval(sexp) {
         Ok(result) => format!("{}: {}", i, result.print()),
         Err(err) => format!("{} Error: {}", i, err),
       }
@@ -40,16 +44,20 @@ impl ProgrammingLanguageInterface for Rukka {
   }
 }
 
-fn eval(expr: Sexp) -> Result<Sexp, String> {
-  use self::Sexp::*; use self::AtomT::*;
-  Ok(match expr {
-    Atom(atom) => match atom {
-      Symbol(s) => Atom(Symbol(s)),
-      LangString(s) => Atom(LangString(s)),
-      Number(s) => Atom(Number(s)),
-    },
-    List(items) => unimplemented!(),
-  })
+
+impl EvaluatorState {
+  fn new() -> EvaluatorState { EvaluatorState { } }
+  fn eval(&mut self, expr: Sexp) -> Result<Sexp, String> {
+    use self::Sexp::*; use self::AtomT::*;
+    Ok(match expr {
+      Atom(atom) => match atom {
+        Symbol(s) => Atom(Symbol(s)),
+        LangString(s) => Atom(LangString(s)),
+        Number(s) => Atom(Number(s)),
+      },
+      List(items) => unimplemented!(),
+    })
+  }
 }
 
 fn read(input: &str) -> Result<Vec<Sexp>, String> {