增加一个重复块相关的语法糖, 使多参数重复时更方便

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mindustry_logic_bang_lang"
-version = "0.16.17"
+version = "0.16.18"
 edition = "2021"
 
 authors = ["A4-Tacks <[email protected]>"]

examples/match.mdtlbl

@@ -357,3 +357,26 @@ print "b"
 print "empty"
 *#
 # 在这里, `Foo`和`Foo[]`的作用已经不同了
+
+
+# 在0.16.18版本给重复块增加了一个语法糖, 如下
+inline@ A B *C {
+    print A", "B", "C"\n";
+}
+#* A >>>
+inline 3@{
+    const match @ {
+        A B *C {
+            {
+                `'print'` A;
+                `'print'` ", ";
+                `'print'` B;
+                `'print'` ", ";
+                `'print'` C;
+                `'print'` "\n";
+            }
+        }
+    }
+}
+*#
+# 由上述展开可以看到它的运作方式, 很容易理解

tools/parser/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "parser"
-version = "0.3.16"
+version = "0.3.17"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

tools/parser/src/parser.lalrpop

@@ -459,13 +459,22 @@ Args: Args = {
         args.into()
     },
 }
-ArgsRepeatBlock: ArgsRepeat
-= <l:@L><chunk:LiteralUInt?><r:@R> "@" <block:MBlock<LogicLine*>> =>? {
-    if chunk == Some(0) {
-        return Err(Error::from((l, Errors::ArgsRepeatChunkByZero, r)).into())
-    }
-    Ok(ArgsRepeat::new(chunk.unwrap_or(1), block.into()))
-};
+ArgsRepeatBlock: ArgsRepeat = {
+    <l:@L><chunk:LiteralUInt?><r:@R>
+    "@" <block:NoPrefixInlineBlock> =>? {
+        if chunk == Some(0) {
+            return Err(Error::from((l, Errors::ArgsRepeatChunkByZero, r)).into())
+        }
+        Ok(ArgsRepeat::new(chunk.unwrap_or(1), block))
+    },
+    "@" <pats:ConstMatchPatAtom+> <block:NoPrefixInlineBlock> => {
+        ArgsRepeat::new(pats.len(), vec![
+            ConstMatch::new(Args::GLOB_ONLY, vec![
+                (pats.into(), block),
+            ]).into()
+        ].into())
+    },
+}
 
 Print: LogicLine = "print" <Args?> LEnd => {
     let Some(args) = <> else {

tools/parser/tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "parser-tests"
-version = "0.1.30"
+version = "0.1.31"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

tools/parser/tests/src/lib.rs

@@ -5052,6 +5052,23 @@ fn match_test() {
             "print nouse",
         ],
     );
+
+    assert_eq!(
+        parse!(parser, r#"
+        inline@ A B *C {
+            print A B C;
+        }
+        "#).unwrap(),
+        parse!(parser, r#"
+        inline 3@{
+            const match @ {
+                A B *C {
+                    print A B C;
+                }
+            }
+        }
+        "#).unwrap(),
+    );
 }
 
 #[test]

tools/syntax/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "syntax"
-version = "0.2.36"
+version = "0.2.37"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

tools/syntax/src/lib.rs

@@ -3172,6 +3172,9 @@ impl ConstMatchPat {
         }
     }
 }
+impl_enum_froms!(impl From for ConstMatchPat {
+    Normal => Vec<ConstMatchPatAtom>;
+});
 
 #[derive(Debug, PartialEq, Clone)]
 pub struct ConstMatchPatAtom {