Merge pull request #180 from Glyphack/improve-parser-errors

enderpy/src/main.rs

@@ -71,7 +71,11 @@ fn tokenize(file: &PathBuf) -> Result<()> {
 
 fn parse(file: &PathBuf) -> Result<()> {
     let source = fs::read_to_string(file)?;
-    let mut parser = Parser::new(source);
+    let file_path = match file.to_str() {
+        Some(path) => path,
+        None =>  "",
+    };
+    let mut parser = Parser::new(source, file_path.into());
     let ast = parser.parse();
     println!("{:#?}", ast);
     Ok(())

parser/Cargo.toml

@@ -16,7 +16,7 @@ serde = { version = "1.0", features = ["derive"] }
 tracing = "0.1"
 tracing-subscriber = "0.3"
 unicode-id-start = "1.0.3"
-miette = "5.6.0"
+miette = { version = "5.6.0", features = ["fancy"] }
 thiserror = "1.0.40"
 
 [dev-dependencies]

parser/src/parser/error.rs

@@ -0,0 +1,27 @@
+use miette::Diagnostic;
+use thiserror::Error;
+
+#[derive(Error, Diagnostic, Debug)]
+pub enum ParsingError {
+    #[error(transparent)]
+    #[diagnostic(code(gen_color::io_error))]
+    IoError(#[from] std::io::Error),
+
+    #[error(
+        "Invalid syntax"
+    )]
+    #[diagnostic(code(
+        gen_color::colors_and_steps_mismatch
+    ))]
+    InvalidSyntax {
+        path: Box<str>,
+        msg: Box<str>,
+        line: u32,
+        #[source_code]
+        input: String,
+        #[help]
+        advice: String,
+        #[label("span")]
+        span: (usize, usize),
+    },
+}

parser/src/parser/mod.rs

@@ -1,5 +1,5 @@
 pub mod ast;
-mod diagnostics;
+pub mod error;
 mod expression;
 mod operator;
 pub mod parser;