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

refactor(parser): modify messages

Browse source
This commit is contained in:
GreasrySlug 2023-02-10 09:50:24 +09:00 • committed by GreasySlug
parent ebd528ec47
commit e5e9da5a7d
2 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/erg_parser/error.rs
View file

@ -280,7 +280,7 @@ impl LexError {
pub fn invalid_seq_elems_error(errno: usize, loc: Location, hint: Option<&str>) -> LexError {
let hint = hint.map(|hint| hint.to_string());
let msg = switch_lang!(
"japanese" => "連続する要素の宣言が異なります",
"japanese" => "要素の列挙の仕方が不正です",
"simplified_chinese" => "无效的Sequential元素声明",
"traditional_chinese" => "無效的Sequential元素聲明",
"english" => "invalid sequential elements declaration",
@ -290,7 +290,7 @@ impl LexError {
pub fn invalid_record_element_err(errno: usize, loc: Location) -> LexError {
let msg = switch_lang!(
"japanese" => "レコード型の要素が宣言が異なります",
"japanese" => "レコード型要素の列挙の仕方が不正です",
"simplified_chinese" => "无效的Record类型元素声明",
"traditional_chinese" => "無效的Record類型元素聲明",
"english" => "invalid record type element declarations",
@ -301,25 +301,29 @@ impl LexError {
let record = StyledStr::new("レコード型", Some(HINT), Some(ATTR));
let var = StyledStr::new("属性", Some(HINT), Some(ATTR));
let def = StyledStr::new("属性=リテラル", Some(HINT), Some(ATTR));
format!("{record}では{var}か{def}のみ使うことができます")
let obj = StyledStr::new("属性=オブジェクト", Some(HINT), Some(ATTR));
format!("{record}では{var}か{def}、{obj}のみ宣言することができます")
},
"simplified_chinese" => {
let record = StyledStr::new("Record类型", Some(HINT), Some(ATTR));
let var = StyledStr::new("attr", Some(HINT), Some(ATTR));
let def = StyledStr::new("attr=lit", Some(HINT), Some(ATTR));
format!("只有{var}或{def}可以在{record}中使用")
let obj = StyledStr::new("attr=object", Some(HINT), Some(ATTR));
format!("{record}中只能声明 {var}、{def} 或 {obj}")
},
"traditional_chinese" => {
let record = StyledStr::new("Record類型", Some(HINT), Some(ATTR));
let var = StyledStr::new("attr", Some(HINT), Some(ATTR));
let def = StyledStr::new("attr=lit", Some(HINT), Some(ATTR));
format!("只有{var}或{def}可以在{record}中使用")
let obj = StyledStr::new("attr=object", Some(HINT), Some(ATTR));
format!("{record}中只能声明 {var}、{def} 或 {obj}")
},
"english" => {
let record = StyledStr::new("Record", Some(HINT), Some(ATTR));
let var = StyledStr::new("attr", Some(HINT), Some(ATTR));
let def = StyledStr::new("attr=lit", Some(HINT), Some(ATTR));
format!("only {var} or {def} can be used in {record}")
let obj = StyledStr::new("attr=object", Some(HINT), Some(ATTR));
format!("only {var}, {def} or {obj} can be declared in {record}")
},
);
Self::syntax_error(errno, loc, msg, Some(hint))

30
crates/erg_parser/parse.rs
View file

@ -1074,9 +1074,9 @@ impl Parser {
} else {
let hint = switch_lang!(
"japanese" => "カンマの代わりに要素を追加してください",
"simplified_chinese" => "应该添加一个元素，而不是逗号",
"traditional_chinese" => "應該添加一個元素，而不是逗號",
"english" => "instead of comma, a element should be added",
"simplified_chinese" => "应该添加一个元素而不是逗号",
"traditional_chinese" => "應該添加一個元素而不是逗號",
"english" => "a element may be added instead of comma",
);
let err = self.skip_and_throw_invalid_seq_err(
caused_by!(),
@ -2479,10 +2479,10 @@ impl Parser {
match self.peek() {
Some(t) if t.is(Semi) => {
let hint = switch_lang!(
"japanese" => "セミコロンの代わりに要素",
"japanese" => "セミコロンの代わりに要素を追加してください",
"simplified_chinese" => "不应该是分号，而应该是元素",
"traditional_chinese" => "不应该是分號，而应该是元素",
"english" => "instead of semicolon, element",
"english" => "a element may be added instead of semicolon",
);
let err = self.skip_and_throw_invalid_seq_err(
caused_by!(),
@ -2578,9 +2578,9 @@ impl Parser {
Some(Comma) => {
let hint = switch_lang!(
"japanese" => "カンマの代わりに要素",
"simplified_chinese" => "一个元素",
"traditional_chinese" => "一個元素",
"english" => "a element",
"simplified_chinese" => "可以添加一个元素而不是逗号",
"traditional_chinese" => "可以添加一個元素而不是逗號",
"english" => "a element may be added instead of comma",
);
let err = self.skip_and_throw_invalid_seq_err(
caused_by!(),
@ -2686,9 +2686,9 @@ impl Parser {
log!(err "error caused by: {caused_by}");
let hint = switch_lang!(
"japanese" => "カンマの代わりに要素",
"simplified_chinese" => "不应该是逗号，而应该是元素",
"traditional_chinese" => "不应该是逗號，而应该是元素",
"english" => "instead of comma, a element",
"simplified_chinese" => "可以添加一个元素而不是逗号",
"traditional_chinese" => "可以添加一個元素而不是逗號",
"english" => "a element may be added instead of comma",
);
let err = self.skip_and_throw_invalid_seq_err(
caused_by!(),
@ -2748,10 +2748,10 @@ impl Parser {
}
Some(_) => {
let hint = switch_lang!(
"japanese" => "セミコロンか括弧",
"simplified_chinese" => "分号或右括号",
"traditional_chinese" => "分號或右括號",
"english" => "semicolon or right bracket",
"japanese" => "セミコロンか括弧を追加してください",
"simplified_chinese" => "可以添加分号或右括号",
"traditional_chinese" => "可以添加分號或右括號",
"english" => "semicolon or right bracket may be added",
);
let err = self.skip_and_throw_invalid_seq_err(
caused_by!(),