add emision of IO errors

danilopedraza · Oct 15, 2024 · fedbdd3 · fedbdd3
1 parent 17a7303
commit fedbdd3
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 71 deletions.
diff --git a/core-browser/src/lib.rs b/core-browser/src/lib.rs
@@ -1,7 +1,7 @@
 mod builtin;
 
 use builtin::{standard_env, STDIN, STDOUT};
-use komodo::{error::error_msg, run::run};
+use komodo::run::run;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]
@@ -22,10 +22,7 @@ pub fn run_code(source: &str, stdin: &str) -> String {
     let run_res = run(source, &mut env);
     let mut res = STDOUT.lock().unwrap().clone();
     if let Err(err) = run_res {
-        res.push_str(
-            &String::from_utf8(error_msg(&err).as_bytes("source.komodo", source))
-                .unwrap_or_default(),
-        );
+        res.push_str(&String::from_utf8(err.as_bytes("source.komodo", source)).unwrap_or_default());
     }
 
     res

diff --git a/core/src/error.rs b/core/src/error.rs
@@ -20,12 +20,70 @@ use crate::{
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Error {
     WithPosition(ErrorKind, Position),
+    IO(String),
 }
 
 impl Error {
     pub fn with_position(err: ErrorKind, pos: Position) -> Self {
         Self::WithPosition(err, pos)
     }
+
+    pub fn as_bytes(&self, filename: &str, source: &str) -> Vec<u8> {
+        match self {
+            Self::WithPosition(err, pos) => {
+                let mut files = SimpleFiles::new();
+                let mut writer = Buffer::no_color();
+                let config = codespan_reporting::term::Config::default();
+
+                let file_id = files.add(filename, source);
+                let diagnostic = Diagnostic::error()
+                    .with_message(error_msg(err))
+                    .with_labels(vec![Label::primary(
+                        file_id,
+                        pos.start..(pos.start + pos.length),
+                    )]);
+
+                let _ = term::emit(&mut writer, &config, &files, &diagnostic);
+
+                writer.into_inner()
+            }
+            Self::IO(err) => err.as_bytes().to_vec(),
+        }
+    }
+
+    pub fn emit(&self, filename: &str, source: &str) {
+        match self {
+            Self::WithPosition(err, pos) => {
+                let mut files = SimpleFiles::new();
+                let writer = StandardStream::stderr(term::termcolor::ColorChoice::Always);
+                let config = codespan_reporting::term::Config::default();
+
+                let file_id = files.add(filename, source);
+                let diagnostic = Diagnostic::error()
+                    .with_message(error_msg(err))
+                    .with_labels(vec![Label::primary(
+                        file_id,
+                        pos.start..(pos.start + pos.length),
+                    )]);
+
+                let _ = term::emit(&mut writer.lock(), &config, &files, &diagnostic);
+            }
+            Self::IO(err) => eprintln!("{err}"),
+        }
+    }
+
+    pub fn msg(&self) -> String {
+        match self {
+            Self::IO(err) => err.to_string(),
+            Self::WithPosition(err, _) => error_msg(err),
+        }
+    }
+}
+
+impl From<std::io::Error> for Error {
+    fn from(value: std::io::Error) -> Self {
+        Self::IO(value.to_string())
+    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -86,18 +144,13 @@ impl Position {
     }
 }
 
-pub fn error_msg(err: &Error) -> ErrorMessage {
+pub fn error_msg(err: &ErrorKind) -> String {
     match err {
-        Error::WithPosition(err, pos) => {
-            let msg = match err {
-                ErrorKind::Lexer(err) => lexer_error_msg(err),
-                ErrorKind::Parser(err) => parser_error_msg(err),
-                ErrorKind::Weeder(err) => weeder_error_msg(err),
-                ErrorKind::Exec(err) => exec_error_msg(err),
-                ErrorKind::Import(err) => import_error_msg(err),
-            };
-            ErrorMessage(msg, *pos)
-        }
+        ErrorKind::Lexer(err) => lexer_error_msg(err),
+        ErrorKind::Parser(err) => parser_error_msg(err),
+        ErrorKind::Weeder(err) => weeder_error_msg(err),
+        ErrorKind::Exec(err) => exec_error_msg(err),
+        ErrorKind::Import(err) => import_error_msg(err),
     }
 }
 
@@ -377,49 +430,8 @@ fn symbol_not_found(module: &str, symbol: &str) -> String {
     format!("`{symbol}` was not found in the `{module}` module")
 }
 
-#[derive(Debug, PartialEq, Eq)]
-pub struct ErrorMessage(pub String, pub Position);
-
-impl ErrorMessage {
-    pub fn as_bytes(&self, filename: &str, source: &str) -> Vec<u8> {
-        let mut files = SimpleFiles::new();
-        let mut writer = Buffer::no_color();
-        let config = codespan_reporting::term::Config::default();
-
-        let file_id = files.add(filename, source);
-        let diagnostic = Diagnostic::error()
-            .with_message(self.0.to_owned())
-            .with_labels(vec![Label::primary(
-                file_id,
-                self.1.start..(self.1.start + self.1.length),
-            )]);
-
-        let _ = term::emit(&mut writer, &config, &files, &diagnostic);
-
-        writer.into_inner()
-    }
-
-    pub fn emit(&self, filename: &str, source: &str) {
-        let mut files = SimpleFiles::new();
-        let writer = StandardStream::stderr(term::termcolor::ColorChoice::Always);
-        let config = codespan_reporting::term::Config::default();
-
-        let file_id = files.add(filename, source);
-        let diagnostic = Diagnostic::error()
-            .with_message(self.0.to_owned())
-            .with_labels(vec![Label::primary(
-                file_id,
-                self.1.start..(self.1.start + self.1.length),
-            )]);
-
-        let _ = term::emit(&mut writer.lock(), &config, &files, &diagnostic);
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use crate::cst::tests::dummy_pos;
-
     use super::*;
 
     #[test]
@@ -474,14 +486,8 @@ mod tests {
     #[test]
     fn eof_reached() {
         assert_eq!(
-            error_msg(&Error::WithPosition(
-                ParserError::EOFReached.into(),
-                dummy_pos()
-            )),
-            ErrorMessage(
-                "The end of the program was reached while reading an expression".into(),
-                dummy_pos()
-            ),
+            error_msg(&ParserError::EOFReached.into()),
+            "The end of the program was reached while reading an expression".to_string(),
         );
     }
 

diff --git a/core/src/main.rs b/core/src/main.rs
@@ -3,7 +3,6 @@ use std::fs;
 use std::io::{Error, ErrorKind};
 use std::path::{Path, PathBuf};
 
-use komodo::error::error_msg;
 #[cfg(feature = "repl")]
 use komodo::repl::{repl, MyCLI};
 use komodo::run::run;
@@ -31,7 +30,7 @@ fn run_file(path: &str) -> std::io::Result<()> {
             let mut env = standard_env(ExecContext::new(reference_path));
             let res = run(&input, &mut env);
             if let Err(err) = res {
-                error_msg(&err).emit(path, &input);
+                err.emit(path, &input);
                 Err(Error::new(ErrorKind::Other, ""))
             } else {
                 Ok(())

diff --git a/core/src/repl.rs b/core/src/repl.rs
@@ -2,7 +2,7 @@ use crate::{
     ast::ASTNode,
     builtin::standard_env,
     env::{Environment, ExecContext},
-    error::{error_msg, Error, ErrorKind, ErrorMessage},
+    error::{Error, ErrorKind},
     lexer::Lexer,
     object::Object,
     parser::{Parser, ParserError},
@@ -68,8 +68,7 @@ impl Repl {
             }
             Err(err) => {
                 self.code.clear();
-                let ErrorMessage(msg, _) = error_msg(&err);
-                (msg, ReplResponse::Error)
+                (err.msg(), ReplResponse::Error)
             }
         }
     }

diff --git a/core/src/run.rs b/core/src/run.rs
@@ -84,7 +84,7 @@ fn get_module_code(module: &ModuleAddress, env: &Environment) -> Result<String,
         ModuleAddress::LocalPath { path } => reference_path.join(Path::new(&path)),
     };
 
-    let source = fs::read_to_string(path).unwrap();
+    let source = fs::read_to_string(path)?;
     Ok(source)
 }