mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-19 19:15:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Integrate CompileError to compiler-core::BaseError

Browse source
This commit is contained in:
Jeong YunWon 2022-08-22 20:21:40 +09:00
parent 1192a11d39
commit 5b50c547d6
5 changed files with 47 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/lib.rs
View file

@ -1,5 +1,5 @@
use rustpython_codegen::{compile, symboltable};
use rustpython_compiler_core::CodeObject;
use rustpython_compiler_core::{BaseError, CodeObject};
use rustpython_parser::{
ast::{fold::Fold, ConstantOptimizer, Location},
error::ParseErrorType,
@ -18,14 +18,21 @@ pub enum CompileErrorType {
Parse(#[from] rustpython_parser::error::ParseErrorType),
}
pub type CompileErrorBody = BaseError<CompileErrorType>;
#[derive(Debug, thiserror::Error)]
pub struct CompileError {
pub error: CompileErrorType,
pub source_path: String,
pub location: Location,
pub body: CompileErrorBody,
pub statement: Option<String>,
}
impl std::ops::Deref for CompileError {
type Target = CompileErrorBody;
fn deref(&self) -> &Self::Target {
&self.body
}
}
impl fmt::Display for CompileError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let loc = self.location;
@ -41,20 +48,18 @@ impl fmt::Display for CompileError {
impl CompileError {
fn from_codegen(error: rustpython_codegen::error::CodegenError, source: &str) -> Self {
let statement = get_statement(source, error.location);
Self {
error: error.error.into(),
location: error.location,
source_path: error.source_path,
statement: get_statement(source, error.location),
body: error.into(),
statement,
}
}
fn from_parse(error: rustpython_parser::error::ParseError, source: &str) -> Self {
let error: rustpython_compiler_core::Error<ParseErrorType> = error.into();
let error: rustpython_compiler_core::BaseError<ParseErrorType> = error.into();
let statement = get_statement(source, error.location);
Self {
error: error.error.into(),
location: error.location,
source_path: error.source_path,
statement: get_statement(source, error.location),
body: error.into(),
statement,
}
}
fn from_symtable(