Integrate CompileError to compiler-core::BaseError

This commit is contained in:
Jeong YunWon 2022-08-22 20:21:40 +09:00
parent 7fcc18daea
commit e8230efe1a
3 changed files with 28 additions and 10 deletions

View file

@ -3,13 +3,13 @@ use std::fmt::Display;
use crate::Location;
#[derive(Debug, PartialEq, Eq)]
pub struct Error<T> {
pub struct BaseError<T> {
pub error: T,
pub location: Location,
pub source_path: String,
}
impl<T> std::ops::Deref for Error<T> {
impl<T> std::ops::Deref for BaseError<T> {
type Target = T;
fn deref(&self) -> &Self::Target {
@ -17,7 +17,7 @@ impl<T> std::ops::Deref for Error<T> {
}
}
impl<T> std::error::Error for Error<T>
impl<T> std::error::Error for BaseError<T>
where
T: std::fmt::Display + std::fmt::Debug,
{
@ -26,7 +26,7 @@ where
}
}
impl<T> Display for Error<T>
impl<T> Display for BaseError<T>
where
T: std::fmt::Display,
{
@ -35,8 +35,26 @@ where
}
}
impl<T> Error<T> {
impl<T> BaseError<T> {
pub fn error(self) -> T {
self.error
}
pub fn from<U>(obj: BaseError<U>) -> Self
where
U: Into<T>,
{
Self {
error: obj.error.into(),
location: obj.location,
source_path: obj.source_path,
}
}
pub fn into<U>(self) -> BaseError<U>
where
T: Into<U>,
{
BaseError::from(self)
}
}

View file

@ -7,6 +7,6 @@ mod location;
mod mode;
pub use bytecode::*;
pub use error::Error;
pub use error::BaseError;
pub use location::Location;
pub use mode::Mode;