language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-09-29 12:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix use-checking

Browse source
This commit is contained in:
Shunsuke Shibayama 2022-09-13 12:24:38 +09:00
parent 605c2fc07e
commit 9079f15d21
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
compiler/erg_compiler/lower.rs
View file

@ -180,17 +180,17 @@ impl ASTLowerer {
}) })
} }
fn use_check(&self, expr: hir::Expr, mode: &str) -> LowerResult<hir::Expr> { fn use_check(&self, expr: &hir::Expr, mode: &str) -> LowerResult<()> {
if mode != "eval" && !expr.ref_t().is_nonelike() { if mode != "eval" && !expr.ref_t().is_nonelike() {
Err(LowerError::syntax_error( Err(LowerError::syntax_error(
0, 0,
expr.loc(), expr.loc(),
self.ctx.name.clone(), self.ctx.name.clone(),
switch_lang!( switch_lang!(
"japanese" => "式の評価結果が使われていません", "japanese" => format!("式の評価結果(: {})が使われていません", expr.ref_t()),
"simplified_chinese" => "表达式评估结果未使用", "simplified_chinese" => format!("表达式评估结果(: {})未使用", expr.ref_t()),
"traditional_chinese" => "表達式評估結果未使用", "traditional_chinese" => format!("表達式評估結果(: {})未使用", expr.ref_t()),
"english" => "the evaluation result of the expression is not used", "english" => format!("the evaluation result of the expression (: {}) is not used", expr.ref_t()),
), ),
Some( Some(
switch_lang!( switch_lang!(
@ -203,7 +203,7 @@ impl ASTLowerer {
), ),
)) ))
} else { } else {
Ok(expr) Ok(())
} }
} }
@ -866,9 +866,9 @@ impl ASTLowerer {
fn lower_block(&mut self, ast_block: ast::Block) -> LowerResult<hir::Block> { fn lower_block(&mut self, ast_block: ast::Block) -> LowerResult<hir::Block> {
log!(info "entered {}", fn_name!()); log!(info "entered {}", fn_name!());
let mut hir_block = Vec::with_capacity(ast_block.len()); let mut hir_block = Vec::with_capacity(ast_block.len());
for expr in ast_block.into_iter() { for chunk in ast_block.into_iter() {
let expr = self.lower_expr(expr)?; let chunk = self.lower_expr(chunk)?;
hir_block.push(expr); hir_block.push(chunk);
} }
Ok(hir::Block::new(hir_block)) Ok(hir::Block::new(hir_block))
} }
@ -878,10 +878,10 @@ impl ASTLowerer {
log!(info "the type-checking process has started."); log!(info "the type-checking process has started.");
let mut module = hir::Module::with_capacity(ast.module.len()); let mut module = hir::Module::with_capacity(ast.module.len());
self.ctx.preregister(ast.module.block())?; self.ctx.preregister(ast.module.block())?;
for expr in ast.module.into_iter() { for chunk in ast.module.into_iter() {
match self.lower_expr(expr).and_then(|e| self.use_check(e, mode)) { match self.lower_expr(chunk) {
Ok(expr) => { Ok(chunk) => {
module.push(expr); module.push(chunk);
} }
Err(e) => { Err(e) => {
self.errs.push(e); self.errs.push(e);
@ -896,6 +896,12 @@ impl ASTLowerer {
self.errs.len() self.errs.len()
); );
let hir = self.ctx.deref_toplevel(hir)?; let hir = self.ctx.deref_toplevel(hir)?;
// TODO: recursive check
for chunk in hir.module.iter() {
if let Err(e) = self.use_check(chunk, mode) {
self.errs.push(e);
}
}
if self.errs.is_empty() { if self.errs.is_empty() {
log!(info "HIR:\n{hir}"); log!(info "HIR:\n{hir}");
log!(info "the AST lowering process has completed."); log!(info "the AST lowering process has completed.");