language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-10-01 21:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update: extract errors as methods and use them

Browse source
This commit is contained in:
GreasySlug 2022-12-23 14:15:30 +09:00
parent da2ff544f9
commit 593aefd139
2 changed files with 141 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

36
compiler/erg_parser/parse.rs
View file

@ -355,32 +355,12 @@ impl Parser {
} else {
Location::Unknown
};
let err = ParseError::syntax_error(
line!() as usize,
loc,
switch_lang!(
"japanese" => "ブロックの解析に失敗しました",
"simplified_chinese" => "无法解析块",
"traditional_chinese" => "無法解析塊",
"english" => "failed to parse a block",
),
None,
);
let err = ParseError::failed_to_analyze_block(line!() as usize, loc);
self.level -= 1;
self.errs.push(err);
Err(())
} else if block.last().unwrap().is_definition() {
let err = ParseError::syntax_error(
line!() as usize,
block.last().unwrap().loc(),
switch_lang!(
"japanese" => "ブロックの終端で変数を定義することは出来ません",
"simplified_chinese" => "无法在块的末尾定义变量",
"traditional_chinese" => "無法在塊的末尾定義變量",
"english" => "cannot define a variable at the end of a block",
),
None,
);
let err = ParseError::invalid_chunk_error(line!() as usize, block.loc());
self.level -= 1;
self.errs.push(err);
Err(())
@ -1469,6 +1449,18 @@ impl Parser {
Some(t) if t.category_is(TC::Literal) => {
// TODO: 10.times ...などメソッド呼び出しもある
let lit = self.try_reduce_lit().map_err(|_| self.stack_dec())?;
if let Some(tk) = self.peek() {
if tk.is(Mutate) {
self.level -= 1;
let err = ParseError::invalid_mutable_symbol(
line!() as usize,
&lit.token.inspect()[..],
lit.loc(),
);
self.errs.push(err);
return Err(());
}
}
self.level -= 1;
Ok(Expr::Lit(lit))
}