添加在原始标识符内将双引号转换为单引号

Author: A4-Tacks

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mindustry_logic_bang_lang"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 
 authors = ["A4-Tacks <wdsjxhno1001@163.com>"]

Cargo.toml

@@ -41,3 +41,4 @@ set int 123_456;
 set n_int -123_456;
 set bin 0b1001_0010;
 set n_bin 0b-1001_0010;
+set x 'abc"def'; # 其中的双引号会被替换为单引号

examples/value.mdtlbl

@@ -1158,6 +1158,7 @@ mod tests {
         assert_eq!(parse!(parser, "@abc-def").unwrap(), "@abc-def");
         assert_eq!(parse!(parser, "@abc-def_30").unwrap(), "@abc-def_30");
         assert_eq!(parse!(parser, "@abc-def-34").unwrap(), "@abc-def-34");
+        assert_eq!(parse!(parser, r#"'abc"def'"#).unwrap(), "abc'def"); // 双引号被替换为单引号
 
         assert!(parse!(parser, "'ab cd'").is_err());
         assert!(parse!(parser, "ab-cd").is_err());

src/syntax.rs

@@ -58,10 +58,8 @@ pub OIdent: Var = r"@[_\p{XID_Start}][\p{XID_Continue}\-]*" => <>.into(); // `@a
 pub Number: Var = r"(?:0(?:x-?[\da-fA-F][_\da-fA-F]*|b-?[01][_01]*)|-?\d[_\d]*(?:\.\d[\d_]*)?)"
     => <>.chars().filter(|&c| c != '_').collect();
 pub OtherValue: Var = r"'[^'\s]+'" => {
-    let mut res: Var = <>.chars().skip(1).collect();
-    res.pop().unwrap();
-    res
-}; // 特殊格式的值, 如`'@abc-def'`
+    <>[1..<>.len()-1].replace('"', "\'")
+}; // 特殊格式的值, 如`'@abc-def'`, 其中双引号会被替换为单引号
 
 // 逻辑里面一个单元
 // 例如`0x50` `'@alpha'` `add` `'a-b-c'`