Implement fmt::Display for Error

Replaces the todo!() stub. InvalidFloatLiteral and InvalidIntegerLiteral now also take the original
string.

1 files changed, 17 insertions, 16 deletions

diff --git a/compiler/src/ast/error.rs b/compiler/src/ast/error.rs
index c3283f4..8117513 100644
--- a/compiler/src/ast/error.rs
+++ b/compiler/src/ast/error.rs
@@ -7,8 +7,8 @@ use std::{
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Error {
     // Number
-    InvalidFloatLiteral(ParseFloatError),
-    InvalidIntegerLiteral(ParseIntError),
+    InvalidFloatLiteral(Rc<str>, ParseFloatError),
+    InvalidIntegerLiteral(Rc<str>, ParseIntError),
 
     // String
     UnclosedString(Rc<str>),
@@ -23,21 +23,22 @@ pub enum Error {
     RecursionLimit,
 }
 
-impl From<ParseFloatError> for Error {
-    fn from(value: ParseFloatError) -> Self {
-        Self::InvalidFloatLiteral(value)
-    }
-}
-
-impl From<ParseIntError> for Error {
-    fn from(value: ParseIntError) -> Self {
-        Self::InvalidIntegerLiteral(value)
-    }
-}
-
 impl fmt::Display for Error {
-    fn fmt(&self, _f: &mut fmt::Formatter) -> fmt::Result {
-        todo!()
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Error::InvalidFloatLiteral(number, err) => {
+                write!(f, "invalid float literal {number}: {err}")
+            }
+            Error::InvalidIntegerLiteral(number, err) => {
+                write!(f, "invalid integer literal {number}: {err}")
+            }
+            Error::UnclosedString(string) => write!(f, "unclosed string {string:?}"),
+            Error::UnexpectedEscapeChar(ch) => write!(f, "unexpected escape char {ch:?}"),
+            Error::UnexpectedRightPar => write!(f, "unexpected right par"),
+            Error::UnclosedLeftPar => write!(f, "unclosed left par"),
+            Error::UnexpectedEof => write!(f, "unexpected eof"),
+            Error::RecursionLimit => write!(f, "recursion limit"),
+        }
     }
 }