refactor(ir): errors for parser

JuniMay · Feb 23, 2024 · 0f45361 · 0f45361
1 parent 1d31433
commit 0f45361
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/ir/frontend/lexer.rs b/src/ir/frontend/lexer.rs
@@ -31,6 +31,10 @@ where
         }
     }
 
+    pub(super) fn curr_pos(&self) -> Pos {
+        self.curr_pos
+    }
+
     fn next_char(&mut self) -> Option<char> {
         let mut buf = [0; 1];
         match self.buf.read(&mut buf) {

diff --git a/src/ir/frontend/parser.rs b/src/ir/frontend/parser.rs
@@ -1,5 +1,7 @@
 use std::io::{self};
 
+use thiserror::Error;
+
 use crate::ir::types::Type;
 
 use super::{
@@ -31,12 +33,14 @@ where
     peeked: bool,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Error)]
 pub enum ParseError {
     /// Lexer error
-    LexerError,
+    #[error("lexer error at {0}")]
+    LexerError(Pos),
 
     /// Unexpected token
+    #[error("unexpected token at {0}")]
     UnexpectedToken(Span),
 }
 
@@ -58,7 +62,10 @@ where
             self.peeked = false;
             return Ok(&self.curr_token);
         }
-        let token = self.lexer.next_token().ok_or(ParseError::LexerError)?;
+        let token = self
+            .lexer
+            .next_token()
+            .ok_or(ParseError::LexerError(self.lexer.curr_pos()))?;
         self.curr_token = token;
         Ok(&self.curr_token)
     }
@@ -70,7 +77,10 @@ where
         if self.peeked {
             return Ok(&self.curr_token);
         }
-        let token = self.lexer.next_token().ok_or(ParseError::LexerError)?;
+        let token = self
+            .lexer
+            .next_token()
+            .ok_or(ParseError::LexerError(self.lexer.curr_pos()))?;
         self.curr_token = token;
         self.peeked = true;
         Ok(&self.curr_token)