Merge pull request #333 from KisaragiEffective/refactor/improve-simpl…

…e-error-with-pos
KisaragiEffective · Dec 21, 2023 · c434e61 · c434e61
2 parents 54ebcc3 + 741c802
commit c434e61
Show file tree

Hide file tree

Showing 7 changed files with 125 additions and 187 deletions.
diff --git a/package/origlang-cli/src/error.rs b/package/origlang-cli/src/error.rs
@@ -1,5 +1,5 @@
 use thiserror::Error;
-use origlang_compiler::parser::SimpleErrorWithPos;
+use origlang_compiler::parser::ParserError;
 use origlang_compiler::type_check::error::TypeCheckError;
 use origlang_runtime::RuntimeError;
 use crate::args::ReadSourceError;
@@ -10,7 +10,7 @@ pub enum TaskExecutionError {
     #[error("Failed to read source: {0}")]
     Source(#[from] ReadSourceError),
     #[error("{0}")]
-    Generic(#[from] SimpleErrorWithPos),
+    Generic(#[from] ParserError),
     #[error("{0}")]
     TypeCheck(#[from] TypeCheckError),
     #[error("{0}")]

diff --git a/package/origlang-cli/src/task/emit.rs b/package/origlang-cli/src/task/emit.rs
@@ -1,6 +1,6 @@
 use thiserror::Error;
 use origlang_compiler::lexer::Lexer;
-use origlang_compiler::parser::{Parser, SimpleErrorWithPos};
+use origlang_compiler::parser::{Parser, ParserError};
 use origlang_compiler::type_check::error::TypeCheckError;
 use origlang_compiler::type_check::TypeChecker;
 use origlang_ir::{IR1, IR2, IntoVerbatimSequencedIR};
@@ -19,7 +19,7 @@ pub enum EmitError {
     #[error("source: {0}")]
     Source(#[from] ReadSourceError),
     #[error("parser: {0}")]
-    Parser(#[from] SimpleErrorWithPos),
+    Parser(#[from] ParserError),
     #[error("type check: {0}")]
     TypeCheck(#[from] TypeCheckError),
 }

diff --git a/package/origlang-cli/src/task/repl.rs b/package/origlang-cli/src/task/repl.rs
@@ -5,7 +5,7 @@ use ariadne::{Report, ReportKind, Source};
 use crate::task::Task;
 use crate::error::TaskExecutionError;
 use origlang_platform::CTRL_D_NL;
-use origlang_compiler::parser::{Parser, ParserError};
+use origlang_compiler::parser::{Parser, ParserErrorInner};
 use origlang_runtime::{PrintToStdout, Runtime, TypeBox};
 use origlang_compiler::type_check::TypeChecker;
 use origlang_ir::{IntoVerbatimSequencedIR, IR2};
@@ -65,9 +65,9 @@ impl Task for Repl {
                     runtime.start(&Self::naive_lower(ast));
                 }
                 Err(error_message) => {
-                    let error = error_message.kind;
+                    let error = error_message.kind();
                     let handled = false;
-                    if let ParserError::PartiallyParsed { hint: _, intermediate_state: _ } = &error {
+                    if let ParserErrorInner::PartiallyParsed { hint: _, intermediate_state: _ } = &error {
                         // TODO: insta-expression eval
                         // TODO: revisit this
                         /*
@@ -92,18 +92,18 @@ impl Task for Repl {
                     if !handled {
                         let error_offset = 0;
                         let error_code = match error {
-                            ParserError::LexerError(_) => 1,
-                            ParserError::UnconsumedToken { .. } => 2,
-                            ParserError::StatementTerminationError => 3,
-                            ParserError::EndOfFileError => 4,
-                            ParserError::UnexpectedToken { .. } => 5,
-                            ParserError::UnParsableIntLiteral { .. } => 6,
-                            ParserError::OverflowedLiteral { .. } => 7,
-                            ParserError::IfExpressionWithoutElseClause => 8,
-                            ParserError::IfExpressionWithoutThenClauseAndElseClause => 9,
-                            ParserError::PartiallyParsed { .. } => 10,
-                            ParserError::InsufficientElementsForTupleLiteral(_) => 11,
-                            ParserError::UnderscoreCanNotBeRightHandExpression => 12,
+                            ParserErrorInner::LexerError(_) => 1,
+                            ParserErrorInner::UnconsumedToken { .. } => 2,
+                            ParserErrorInner::StatementTerminationError => 3,
+                            ParserErrorInner::EndOfFileError => 4,
+                            ParserErrorInner::UnexpectedToken { .. } => 5,
+                            ParserErrorInner::UnParsableIntLiteral { .. } => 6,
+                            ParserErrorInner::OverflowedLiteral { .. } => 7,
+                            ParserErrorInner::IfExpressionWithoutElseClause => 8,
+                            ParserErrorInner::IfExpressionWithoutThenClauseAndElseClause => 9,
+                            ParserErrorInner::PartiallyParsed { .. } => 10,
+                            ParserErrorInner::InsufficientElementsForTupleLiteral(_) => 11,
+                            ParserErrorInner::UnderscoreCanNotBeRightHandExpression => 12,
                         };
 
                         let d = Report::<Range<usize>>::build(ReportKind::Error, (), error_offset)

diff --git a/package/origlang-compiler-entrypoint/src/lib.rs b/package/origlang-compiler-entrypoint/src/lib.rs
@@ -7,7 +7,7 @@ use log::debug;
 use thiserror::Error;
 use origlang_ast::Statement;
 use origlang_compiler::lexer::token::{Token as LexerToken};
-use origlang_compiler::parser::{Parser, SimpleErrorWithPos};
+use origlang_compiler::parser::{Parser, ParserError};
 use origlang_compiler::type_check::error::TypeCheckError;
 use origlang_compiler::type_check::TypeChecker;
 use origlang_diagnostics::{Diagnostic, DiagnosticSink};
@@ -104,7 +104,7 @@ impl Default for TheCompiler {
 #[derive(Debug, Eq, PartialEq, Error)]
 pub enum PartialCompilation {
     #[error("syntax error: {0}")]
-    Parser(#[from] SimpleErrorWithPos),
+    Parser(#[from] ParserError),
     #[error("type check error: {0}")]
     TypeChecker(#[from] TypeCheckError),
 }