language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-09-27 11:59:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: modify Chinese error information

Browse source
This commit is contained in:
Cai Bingjun 2023-06-04 14:49:40 +08:00
parent d707da8ba6
commit 47718b43e1
3 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/erg_compiler/error/tycheck.rs
View file

@ -1205,7 +1205,7 @@ passed keyword args: {kw_args_len}"
vec![SubMessage::only_loc(loc)], vec![SubMessage::only_loc(loc)],
switch_lang!( switch_lang!(
"japanese" => format!("型が期待されましたが、{tp}は型ではありません"), "japanese" => format!("型が期待されましたが、{tp}は型ではありません"),
"simplified_chinese" => format!("期望一个类型，但是得到了{tp}"), "simplified_chinese" => format!("期望类型，但是得到了{tp}"),
"traditional_chinese" => format!("期望一個類型，但是得到了{tp}"), "traditional_chinese" => format!("期望一個類型，但是得到了{tp}"),
"english" => format!("expected a type, but got {tp}"), "english" => format!("expected a type, but got {tp}"),
), ),

2
crates/erg_compiler/ty/deserialize.rs
View file

@ -79,7 +79,7 @@ impl DeserializeError {
"{expect}型オブジェクトを予期しましたが、 読み込んだオブジェクトは{found}型です", "{expect}型オブジェクトを予期しましたが、 読み込んだオブジェクトは{found}型です",
), ),
"simplified_chinese" => format!( "simplified_chinese" => format!(
"期望一个{expect}对象，但反序列化的对象是{found}", "期望{expect}对象，但反序列化的对象是{found}",
), ),
"traditional_chinese" => format!( "traditional_chinese" => format!(
"期望一個{expect}對象，但反序列化的對像是{found}", "期望一個{expect}對象，但反序列化的對像是{found}",

100
crates/erg_parser/parse.rs
View file

@ -609,8 +609,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: デコレータ", "japanese" => "予期: デコレータ",
"simplified_chinese" => "期望：装饰器", "simplified_chinese" => "期望: 装饰器",
"traditional_chinese" => "期望：裝飾器", "traditional_chinese" => "期望: 裝飾器",
"english" => "expect: decorator", "english" => "expect: decorator",
)) ))
} }
@ -651,8 +651,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: タイプ指定", "japanese" => "予期: タイプ指定",
"simplified_chinese" => "期望：类型规范", "simplified_chinese" => "期望: 类型规范",
"traditional_chinese" => "期望：類型規範", "traditional_chinese" => "期望: 類型規範",
"english" => "expect: type specification", "english" => "expect: type specification",
)) ))
} }
@ -774,8 +774,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: Nat type", "japanese" => "予期: Nat type",
"simplified_chinese" => "期望：Nat类型", "simplified_chinese" => "期望: Nat类型",
"traditional_chinese" => "期望：Nat類型", "traditional_chinese" => "期望: Nat類型",
"english" => "expect: Nat type", "english" => "expect: Nat type",
)) ))
} }
@ -1115,8 +1115,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: Nat型", "japanese" => "予期: Nat型",
"simplified_chinese" => "期望：Nat类型", "simplified_chinese" => "期望: Nat类型",
"traditional_chinese" => "期望：Nat類型", "traditional_chinese" => "期望: Nat類型",
"english" => "expect: Nat type", "english" => "expect: Nat type",
)) ))
} }
@ -1131,8 +1131,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: 型指定", "japanese" => "予期: 型指定",
"simplified_chinese" => "期望：类型规范", "simplified_chinese" => "期望: 类型规范",
"traditional_chinese" => "期望：類型規範", "traditional_chinese" => "期望: 類型規範",
"english" => "expect: type specification", "english" => "expect: type specification",
)) ))
} }
@ -1173,8 +1173,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: 型指定", "japanese" => "予期: 型指定",
"simplified_chinese" => "期望：类型规范", "simplified_chinese" => "期望: 类型规范",
"traditional_chinese" => "期望：類型規範", "traditional_chinese" => "期望: 類型規範",
"english" => "expect: type specification", "english" => "expect: type specification",
)) ))
} }
@ -1196,8 +1196,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: 型指定", "japanese" => "予期: 型指定",
"simplified_chinese" => "期望：类型规范", "simplified_chinese" => "期望: 类型规范",
"traditional_chinese" => "期望：類型規範", "traditional_chinese" => "期望: 類型規範",
"english" => "expect: type specification", "english" => "expect: type specification",
)) ))
} }
@ -1248,8 +1248,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: 引数", "japanese" => "予期: 引数",
"simplified_chinese" => "期望：参数", "simplified_chinese" => "期望: 参数",
"traditional_chinese" => "期望：參數", "traditional_chinese" => "期望: 參數",
"english" => "expect: an argument", "english" => "expect: an argument",
)) ))
} }
@ -1459,8 +1459,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: 式", "japanese" => "予期: 式",
"simplified_chinese" => "期望：表达", "simplified_chinese" => "期望: 表达",
"traditional_chinese" => "期望：表達", "traditional_chinese" => "期望: 表達",
"english" => "expect: expression", "english" => "expect: expression",
)) ))
} }
@ -1508,8 +1508,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: 式", "japanese" => "予期: 式",
"simplified_chinese" => "期望：表达", "simplified_chinese" => "期望: 表达",
"traditional_chinese" => "期望：表達", "traditional_chinese" => "期望: 表達",
"english" => "expect: expression", "english" => "expect: expression",
)) ))
} }
@ -1540,8 +1540,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: 式", "japanese" => "予期: 式",
"simplified_chinese" => "期望：表达", "simplified_chinese" => "期望: 表达",
"traditional_chinese" => "期望：表達", "traditional_chinese" => "期望: 表達",
"english" => "expect: expression", "english" => "expect: expression",
)) ))
} }
@ -1602,8 +1602,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: 数値、式", "japanese" => "予期: 数値、式",
"simplified_chinese" => "期望：数字或表达式", "simplified_chinese" => "期望: 数字或表达式",
"traditional_chinese" => "期望：數字或表達式", "traditional_chinese" => "期望: 數字或表達式",
"english" => "expect: number or expression", "english" => "expect: number or expression",
)); ));
} }
@ -1733,8 +1733,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: Nat型", "japanese" => "予期: Nat型",
"simplified_chinese" => "期望：Nat类型", "simplified_chinese" => "期望: Nat类型",
"traditional_chinese" => "期望：Nat類型", "traditional_chinese" => "期望: Nat類型",
"english" => "expect: Nat type", "english" => "expect: Nat type",
)) ))
} }
@ -1867,8 +1867,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: Nat型", "japanese" => "予期: Nat型",
"simplified_chinese" => "期望：Nat类型", "simplified_chinese" => "期望: Nat类型",
"traditional_chinese" => "期望：Nat類型", "traditional_chinese" => "期望: Nat類型",
"english" => "expect: Nat type", "english" => "expect: Nat type",
)) ))
} }
@ -1907,8 +1907,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: 数値、式", "japanese" => "予期: 数値、式",
"simplified_chinese" => "期望：数字或表达式", "simplified_chinese" => "期望: 数字或表达式",
"traditional_chinese" => "期望：數字或表達式", "traditional_chinese" => "期望: 數字或表達式",
"english" => "expect: number or expression", "english" => "expect: number or expression",
)) ))
} }
@ -1968,8 +1968,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: Nat型", "japanese" => "予期: Nat型",
"simplified_chinese" => "期望：Nat类型", "simplified_chinese" => "期望: Nat类型",
"traditional_chinese" => "期望：Nat類型", "traditional_chinese" => "期望: Nat類型",
"english" => "expect: Nat type", "english" => "expect: Nat type",
)) ))
} }
@ -2091,8 +2091,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: デフォルト引数", "japanese" => "予期: デフォルト引数",
"simplified_chinese" => "期望：默认参数", "simplified_chinese" => "期望: 默认参数",
"traditional_chinese" => "期望：默認參數", "traditional_chinese" => "期望: 默認參數",
"english" => "expect: default parameter", "english" => "expect: default parameter",
)) ))
} }
@ -2161,8 +2161,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "期待: デコレータ", "japanese" => "期待: デコレータ",
"simplified_chinese" => "期望：装饰器", "simplified_chinese" => "期望: 装饰器",
"traditions_chinese" => "期望：裝飾器", "traditions_chinese" => "期望: 裝飾器",
"english" => "expect: decorator", "english" => "expect: decorator",
)) ))
} }
@ -2209,8 +2209,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "期待: 可変長引数", "japanese" => "期待: 可変長引数",
"simplified_chinese" => "期望：可变长度参数", "simplified_chinese" => "期望: 可变长度参数",
"traditional_chinese" => "期望：可變長度參數", "traditional_chinese" => "期望: 可變長度參數",
"english" => "expect: variable-length arguments", "english" => "expect: variable-length arguments",
)) ))
} }
@ -2253,8 +2253,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "期待: 要素", "japanese" => "期待: 要素",
"simplified_chinese" => "期望：元素", "simplified_chinese" => "期望: 元素",
"traditional_chinese" => "期望：元素", "traditional_chinese" => "期望: 元素",
"english" => "expect: an element", "english" => "expect: an element",
)) ))
} }
@ -2398,8 +2398,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "期待: Nat型", "japanese" => "期待: Nat型",
"simplified_chinese" => "期望：Nat类型", "simplified_chinese" => "期望: Nat类型",
"traditional_chinese" => "期望：Nat類型", "traditional_chinese" => "期望: Nat類型",
"english" => "expect: Nat type", "english" => "expect: Nat type",
)) ))
} }
@ -2686,8 +2686,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "期待: 要素", "japanese" => "期待: 要素",
"simplified_chinese" => "期望：元素", "simplified_chinese" => "期望: 元素",
"traditional_chinese" => "期望：元素", "traditional_chinese" => "期望: 元素",
"english" => "expect: an element", "english" => "expect: an element",
)) ))
} }
@ -2806,8 +2806,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: 属性", "japanese" => "予期: 属性",
"simplified_chinese" => "期望：属性", "simplified_chinese" => "期望: 属性",
"traditional_chinese" => "期望：屬性", "traditional_chinese" => "期望: 屬性",
"english" => "expect: an attribute", "english" => "expect: an attribute",
)) ))
} }
@ -2901,8 +2901,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: キー", "japanese" => "予期: キー",
"simplified_chinese" => "期望：关键", "simplified_chinese" => "期望: 关键",
"traditional_chinese" => "期望：關鍵", "traditional_chinese" => "期望: 關鍵",
"english" => "expect: key", "english" => "expect: key",
)) ))
} }
@ -2959,8 +2959,8 @@ impl Parser {
if let Some(err) = self.errs.last_mut() { if let Some(err) = self.errs.last_mut() {
err.set_hint(switch_lang!( err.set_hint(switch_lang!(
"japanese" => "予期: }か要素", "japanese" => "予期: }か要素",
"simplified_chinese" => "期望：}或元素", "simplified_chinese" => "期望: }或元素",
"traditional_chinese" => "期望：}或元素", "traditional_chinese" => "期望: }或元素",
"english" => "expect: } or element", "english" => "expect: } or element",
)) ))
} }