允许在const-match中, 为@也使用*进行take

Cargo.toml

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

examples/const_match.mdtlbl

@@ -84,3 +84,10 @@ const match @ {
     }
 }
 # 在只有一个分支时可以减少一层括号, 用于快速接收参数等情况非常舒适
+
+
+# 在0.17.21版本对@匹配也允许加*对其进行take了
+const match (foo;) => *@ { }
+#* >>>
+foo
+*#

examples/function.mdtlbl

@@ -10,9 +10,7 @@
 Builtin.BindSep! '.';
 Builtin.MissesMatch! 1;
 
-const Function = (const match @ => @ F {
-    match @ => @ { }
-
+const Function = (const match @ => *@ F {
     take B = $;
 
     skip {

tools/display_source/Cargo.toml

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

tools/display_source/src/impls.rs

@@ -684,11 +684,14 @@ impl DisplaySource for ConstMatchPat {
             ConstMatchPat::Normal(args) => {
                 meta.display_source_iter_by_space(args)
             },
-            ConstMatchPat::Expanded(prefix, suffix) => {
+            ConstMatchPat::Expanded(prefix, do_take, suffix) => {
                 for s in prefix {
                     s.display_source(meta);
                     meta.add_space();
                 }
+                if *do_take {
+                    meta.push("*")
+                }
                 meta.push("@");
                 for s in suffix {
                     meta.add_space();

tools/parser/Cargo.toml

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

tools/parser/src/parser.lalrpop

@@ -438,7 +438,7 @@ ConstMatch: ConstMatch = {
 
 ConstMatchPat: ConstMatchPat = {
     ConstMatchPatAtom* => ConstMatchPat::Normal(<>),
-    <ConstMatchPatAtom*> "@" <ConstMatchPatAtom*>
+    <ConstMatchPatAtom*> <Opt<"*">> "@" <ConstMatchPatAtom*>
         => ConstMatchPat::Expanded(<>),
 }
 

tools/parser/tests/Cargo.toml

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

tools/parser/tests/src/lib.rs

@@ -5521,6 +5521,18 @@ fn match_test() {
             "print __2",
         ],
     );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        const match (arg;) => @ {}
+        match (a;) @ (b;) => @ {}
+        "#).unwrap()).compile().unwrap(),
+        vec![
+            "a",
+            "arg",
+            "b",
+        ],
+    );
 }
 
 #[test]
@@ -5993,6 +6005,62 @@ fn const_match_test() {
             "foo h",
         ],
     );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        const match (arg;) => @ {}
+        const match (a;) @ (b;) => A @ *B {}
+        "#).unwrap()).compile().unwrap(),
+        vec![
+            "b",
+        ],
+    );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        const match (arg;) => @ {}
+        const match (a;) @ (b;) => *A @ *B {}
+        "#).unwrap()).compile().unwrap(),
+        vec![
+            "a",
+            "b",
+        ],
+    );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        const match (arg;) => @ {}
+        const match (a;) @ (b;) => *A *@ *B {}
+        "#).unwrap()).compile().unwrap(),
+        vec![
+            "a",
+            "arg",
+            "b",
+        ],
+    );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        const match (arg;) => @ {}
+        const match (a;) @ (b;) => A *@ *B {}
+        "#).unwrap()).compile().unwrap(),
+        vec![
+            "arg",
+            "b",
+        ],
+    );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        const match (arg;) => @ {}
+        const match (a;) @ (b;) => A *@ *B { end; }
+        "#).unwrap()).compile().unwrap(),
+        vec![
+            "arg",
+            "b",
+            "end",
+        ],
+    );
 }
 
 #[test]

tools/syntax/Cargo.toml

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

tools/syntax/src/lib.rs

@@ -3114,13 +3114,13 @@ impl Compile for ConstMatch {
 #[derive(Debug, PartialEq, Clone)]
 pub enum ConstMatchPat {
     Normal(Vec<ConstMatchPatAtom>),
-    Expanded(Vec<ConstMatchPatAtom>, Vec<ConstMatchPatAtom>),
+    Expanded(Vec<ConstMatchPatAtom>, /**take*/bool, Vec<ConstMatchPatAtom>),
 }
 impl ConstMatchPat {
     pub fn check_len(&self, value_len: usize) -> bool {
         match self {
             ConstMatchPat::Normal(norm) => norm.len() == value_len,
-            ConstMatchPat::Expanded(left, right) => {
+            ConstMatchPat::Expanded(left, _, right) => {
                 left.len() + right.len() <= value_len
             },
         }
@@ -3199,7 +3199,7 @@ impl ConstMatchPat {
                 code.compile(meta);
                 Ok(())
             },
-            Self::Expanded(left, right) => {
+            Self::Expanded(left, do_take, right) => {
                 let mid_rng = left.len()..handles.len()-right.len();
                 let Some(left_datas)
                     = do_iter(left, meta, handles)
@@ -3214,13 +3214,22 @@ impl ConstMatchPat {
                 for ele in left_datas {
                     make(ele, meta);
                 }
-                for ele in right_datas {
-                    make(ele, meta);
-                }
+
+                let packer = if !do_take { identity } else {
+                    |arg: Value| ValueBindRef::new(
+                        arg.into(),
+                        ValueBindRefTarget::ResultHandle,
+                    ).into()
+                };
                 let expand_args = handles[mid_rng].iter()
                     .map_into()
+                    .map(packer)
                     .collect::<Vec<_>>();
                 LogicLine::SetArgs(expand_args.into()).compile(meta);
+
+                for ele in right_datas {
+                    make(ele, meta);
+                }
                 code.compile(meta);
                 Ok(())
             },