1 files changed, 13 insertions, 12 deletions

diff --git a/src/app.rs b/src/app.rs
index ffa73dd..fb6e9df 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -2,14 +2,15 @@ use crate::{
     bitmap::{positive_angle_with_x, MapPoint, Pixmap},
     brush::{Brush, CircleBrush, LineBrush},
     command::CommandBox,
-    consts::{colors::*, FONT_PATH},
+    consts::{colors::*, FONT_PATH, STDLIB_PATH},
     dither,
+    error::AppError,
     lisp::{eval, lex::Lexer, parse::Parser, prelude, EnvList},
     message::Message,
     rect,
     symmetry::Symmetry,
     undo::{ModifyRecord, OpKind, PaintRecord, UndoStack},
-    utils::{draw_text, handle_error, is_copy_event, is_paste_event},
+    utils::{draw_text, handle_error, is_copy_event, is_paste_event, load_script},
 };
 
 use std::{convert::From, fs::File, io::prelude::*, path::Path};
@@ -284,7 +285,7 @@ impl<'ctx, 'file> AppState<'ctx, 'file> {
                 Ok(val) => self.message.set_info(format!("{}", val)),
                 Err(eval_err) => self.message.set_error(format!("{}", eval_err)),
             },
-            Err(err) => self.message = handle_error(err, &lisp_expr),
+            Err(err) => self.message = handle_error(err, &lisp_expr, "repl"),
         }
         self.command_box.hist_append();
 
@@ -510,8 +511,8 @@ impl<'ctx, 'file> AppState<'ctx, 'file> {
         ttf_context: &'ctx Sdl2TtfContext,
         start_data: Option<Vec<bool>>,
         file_name: Option<&'file Path>,
-    ) -> Self {
-        let video_subsystem = context.video().unwrap();
+    ) -> Result<Self, AppError> {
+        let video_subsystem = context.video().map_err(AppError::Sdl)?;
 
         let window = video_subsystem
             .window("Pixel editor", 500, 500)
@@ -519,18 +520,16 @@ impl<'ctx, 'file> AppState<'ctx, 'file> {
             .resizable()
             .opengl()
             .build()
-            .map_err(|e| e.to_string())
-            .unwrap();
+            .map_err(|e| AppError::Sdl(e.to_string()))?;
 
         let canvas = window
             .into_canvas()
             .build()
-            .map_err(|e| e.to_string())
-            .unwrap();
+            .map_err(|e| AppError::Sdl(e.to_string()))?;
 
         let data = start_data.unwrap_or(vec![false; (width * height) as usize]);
         let pixmap = Pixmap::new_with(width, height, data);
-        Self {
+        let mut app = Self {
             active_color: true,
             brush: Brush::new(0),
             canvas,
@@ -540,7 +539,7 @@ impl<'ctx, 'file> AppState<'ctx, 'file> {
             dither_level: 16,
             file_name,
             grid: Grid::new(),
-            lisp_env: vec![prelude::new_env()],
+            lisp_env: vec![prelude::new_env().map_err(AppError::Lisp)?],
             message: Message::new().text(" "),
             mode: Mode::Draw,
             mouse: (0, 0),
@@ -550,7 +549,9 @@ impl<'ctx, 'file> AppState<'ctx, 'file> {
             ttf_context,
             undo_stack: UndoStack::new(),
             zoom: 5,
-        }
+        };
+        load_script(STDLIB_PATH, &mut app).map_err(AppError::Lisp)?;
+        Ok(app)
     }
 
     pub fn export(&self) -> Image {