language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-08-04 18:58:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: error-tolerant lowering

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-08-22 00:43:56 +09:00
parent 6dcc9634fb
commit 0868e5fb23
4 changed files with 947 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/erg_compiler/declare.rs
View file

@ -1067,9 +1067,9 @@ impl<A: ASTBuildable> GenericASTLowerer<A> {
ast::Expr::Literal(lit) if lit.is_doc_comment() => {
Ok(hir::Expr::Literal(self.lower_literal(lit, None)?))
}
ast::Expr::Accessor(acc) if allow_acc => {
Ok(hir::Expr::Accessor(self.lower_acc(acc, None)?))
}
ast::Expr::Accessor(acc) if allow_acc => Ok(hir::Expr::Accessor(
self.lower_acc(acc, None).map_err(|(_, errs)| errs)?,
)),
ast::Expr::Def(def) => Ok(hir::Expr::Def(self.declare_def(def)?)),
ast::Expr::TypeAscription(tasc) => Ok(hir::Expr::TypeAsc(self.declare_ident(tasc)?)),
ast::Expr::Call(call)
@ -1078,7 +1078,9 @@ impl<A: ASTBuildable> GenericASTLowerer<A> {
.map(|op| op.is_import())
.unwrap_or(false) =>
{
Ok(hir::Expr::Call(self.lower_call(call, None)))
Ok(hir::Expr::Call(
self.lower_call(call, None).map_err(|(_, errs)| errs)?,
))
}
ast::Expr::Compound(compound) => {
let mut chunks = vec![];
@ -1097,7 +1099,9 @@ impl<A: ASTBuildable> GenericASTLowerer<A> {
Ok(hir::Expr::Dummy(hir::Dummy::new(dummy_)))
}
ast::Expr::InlineModule(inline) => {
let import = self.lower_inline_module(inline, None);
let import = self
.lower_inline_module(inline, None)
.map_err(|(_, es)| es)?;
Ok(hir::Expr::Call(import))
}
other => Err(LowerErrors::from(LowerError::declare_error(

5
crates/erg_compiler/lint.rs
View file

@ -265,7 +265,10 @@ impl<ASTBuilder: ASTBuildable> GenericASTLowerer<ASTBuilder> {
Ok(chunk) => {
module.push(chunk);
}
Err(errs) => {
Err((chunk, errs)) => {
if let Some(chunk) = chunk {
module.push(chunk);
}
self.errs.extend(errs);
}
}

1338
crates/erg_compiler/lower.rs
View file

File diff suppressed because it is too large Load diff

11
crates/erg_compiler/ty/mod.rs
View file

@ -447,6 +447,17 @@ impl StructuralEq for SubrType {
}
impl SubrType {
pub fn failed() -> Self {
Self::new(
SubrKind::Func,
vec![],
Some(ParamTy::Pos(Type::Obj)),
vec![],
Some(ParamTy::Pos(Type::Obj)),
Type::Failure,
)
}
pub fn new(
kind: SubrKind,
non_default_params: Vec<ParamTy>,