1 files changed, 14 insertions, 8 deletions

diff --git a/src/lisp/lex.rs b/src/lisp/lex.rs
index e514d7f..5d3030b 100644
--- a/src/lisp/lex.rs
+++ b/src/lisp/lex.rs
@@ -1,6 +1,6 @@
 use std::{fmt, str::CharIndices};
 
-use crate::lisp::error::{LispError, ParseError, ParseErrorKind};
+use crate::lisp::error::{ParseError, ParseErrorKind};
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum Token<'a> {
@@ -75,21 +75,27 @@ impl Span {
 }
 
 #[derive(Debug, Clone)]
-pub struct SpanDisplay<'src> {
+pub struct SpanDisplay<'src, 'file> {
+    pub file_name: &'file str,
     pub source: &'src str,
     pub line: usize,
     pub col: usize,
 }
 
-impl<'src> SpanDisplay<'src> {
-    pub fn highlight_span(span: Span, source: &'src str) -> Self {
+impl<'src, 'file> SpanDisplay<'src, 'file> {
+    pub fn highlight_span(span: Span, source: &'src str, file_name: &'file str) -> Self {
         let line_start = match source[..span.low as usize].rfind('\n') {
             Some(pos) => pos + 1,
             None => 0,
         };
         let line = source[..line_start].chars().filter(|&c| c == '\n').count() + 1;
         let col = source[line_start..span.low as usize].chars().count();
-        Self { source, line, col }
+        Self {
+            file_name,
+            source,
+            line,
+            col,
+        }
     }
 }
 
@@ -108,7 +114,7 @@ impl<'a> Lexer<'a> {
         }
     }
 
-    pub fn next_token(&mut self) -> Result<(Span, Token<'a>), LispError> {
+    pub fn next_token(&mut self) -> Result<(Span, Token<'a>), ParseError> {
         let mut chars = self.input.char_indices();
 
         while let Some((ind, chr)) = chars.next() {
@@ -142,13 +148,13 @@ impl<'a> Lexer<'a> {
             let (size, token) = match res {
                 Ok(v) => v,
                 Err(kind) => {
-                    return Err(LispError::Parse(ParseError {
+                    return Err(ParseError {
                         span: Span {
                             low,
                             high: low + chr.len_utf8() as u32,
                         },
                         kind,
-                    }))
+                    })
                 }
             };
             self.cur_pos += size as u32;