use new error kinds; track Environment nesting with stack

1 files changed, 35 insertions, 27 deletions

diff --git a/src/app.rs b/src/app.rs
index d35febf..09f52f9 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -3,7 +3,7 @@ use crate::{
     command::CommandBox,
     consts::{colors::*, FONT_PATH},
     dither,
-    lisp::{eval, lex::Lexer, parse::Parser, Environment},
+    lisp::{eval, lex::Lexer, parse::Parser, prelude, EnvList, Environment},
     message::Message,
     rect,
     symmetry::Symmetry,
@@ -11,7 +11,12 @@ use crate::{
     utils::{draw_text, is_copy_event, is_paste_event},
 };
 
-use std::{convert::From, fs::File, io::prelude::*};
+use std::{
+    convert::From,
+    fs::File,
+    io::prelude::*,
+    path::{Path, PathBuf},
+};
 
 use obi::Image;
 use sdl2::{
@@ -32,7 +37,7 @@ pub enum Mode {
     Command,
 }
 
-pub struct AppState<'ctx> {
+pub struct AppState<'ctx, 'file> {
     pub active_color: bool,
     pub brush_size: u8,
     pub canvas: Canvas<Window>,
@@ -40,9 +45,10 @@ pub struct AppState<'ctx> {
     pub context: &'ctx Sdl,
     pub current_operation: Operation,
     pub dither_level: u8,
+    pub file_name: Option<&'file Path>,
     pub grid: Grid,
     pub last_point: Option<MapPoint>,
-    pub lisp_env: Environment,
+    pub lisp_env: EnvList,
     pub message: Message,
     pub mode: Mode,
     pub mouse: (i32, i32),
@@ -69,7 +75,7 @@ impl Grid {
 }
 
 // private actions on appstate
-impl<'ctx> AppState<'ctx> {
+impl<'ctx, 'file> AppState<'ctx, 'file> {
     fn pan<P: Into<Point>>(&mut self, direction: P) {
         self.start += direction.into();
     }
@@ -280,22 +286,22 @@ impl<'ctx> AppState<'ctx> {
         let lisp_expr = &self.command_box.text;
         let mut parser = Parser::new(Lexer::new(lisp_expr, 0));
         let res = parser.parse_single_expr();
-        match eval::eval(&res.unwrap(), self, None) {
-            Ok(val) => {
-                self.message.text = format!("{}", val);
-            }
-            Err(_) => {
-                self.message.text = format!("Lisp Error!");
-            }
-        }
-
-        if let Some(path) = self.command_box.text.strip_prefix("(save ") {
-            let image = self.export();
-            let encoded = image.encode().unwrap();
-            let mut buffer = File::create(path).unwrap();
-            buffer.write_all(&encoded[..]).unwrap();
-            self.command_box.hist_append();
+        match res {
+            Ok(expr) => match eval::eval(&expr, self) {
+                Ok(val) => self.message.set_info(format!("{}", val)),
+                Err(eval_err) => self.message.set_error(format!("{}", eval_err)),
+            },
+            Err(parse_err) => self.message.set_error(format!("{}", parse_err)),
         }
+        self.command_box.hist_append();
+
+        // if let Some(path) = self.command_box.text.strip_prefix("(save ") {
+        //     let image = self.export();
+        //     let encoded = image.encode().unwrap();
+        //     let mut buffer = File::create(path).unwrap();
+        //     buffer.write_all(&encoded[..]).unwrap();
+        //     self.command_box.hist_append();
+        // }
         self.command_box.clear();
         self.mode = Mode::Draw;
     }
@@ -371,7 +377,7 @@ impl<'ctx> AppState<'ctx> {
                 &mut self.canvas,
                 self.ttf_context,
                 &self.message.text[..],
-                WHITE,
+                self.message.kind.into(),
                 (0, winsize_y - cmd_height),
             );
             return;
@@ -473,18 +479,19 @@ impl<'ctx> AppState<'ctx> {
 
     pub fn quit(&mut self) {
         let ev = self.context.event().unwrap();
-        ev.push_event(Event::Quit { timestamp: 0u32 });
+        ev.push_event(Event::Quit { timestamp: 0u32 })
+            .expect("ohno unable to quit");
     }
 }
 
-// publicly available functions on appstate
-impl<'ctx> AppState<'ctx> {
+impl<'ctx, 'file> AppState<'ctx, 'file> {
     pub fn init(
         width: u32,
         height: u32,
         context: &'ctx Sdl,
         ttf_context: &'ctx Sdl2TtfContext,
         start_data: Option<Vec<bool>>,
+        file_name: Option<&'file Path>,
     ) -> Self {
         let video_subsystem = context.video().unwrap();
 
@@ -509,21 +516,22 @@ impl<'ctx> AppState<'ctx> {
             active_color: true,
             brush_size: 0,
             canvas,
-            context,
             command_box: CommandBox::new(),
+            context,
             current_operation: Vec::new(),
             dither_level: 16,
+            file_name,
             grid: Grid::new(),
             last_point: None,
-            mode: Mode::Draw,
+            lisp_env: vec![prelude::new_env()],
             message: Message::new().text(" "),
+            mode: Mode::Draw,
             mouse: (0, 0),
             pixmap,
             start: Point::new(60, 60),
             symmetry: Default::default(),
             ttf_context,
             undo_stack: UndoStack::new(),
-            lisp_env: eval::with_prelude(),
             zoom: 5,
         }
     }