增加两个take相关的语法糖

Cargo.toml

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

examples/op_expr.mdtlbl

@@ -235,3 +235,9 @@ i++; j--;
     op ___1 ___1 - `1`;
 }
 *#
+
+
+# 在0.16.22版本为了使take配合op-expr更加简洁, 添加了一个语法糖
+take*A, B = x+y, i++;
+# 相当于
+take A=(*x+y) B=(*i++);

examples/take.mdtlbl

@@ -25,3 +25,9 @@ print __1
 
 # 可以看到, 我们可以对常量的值计算一次但是多次使用结果
 # 如果直接`print F;`, 将会每次都进行计算
+
+
+# 可以直接take一个空的DExp, 利用其自动分配匿名返回句柄的行为声明一个匿名量
+take X = ();
+# 在0.16.22版本有一个语法糖, 可以更简短的完成这个例子
+take+X;

syntax/vim/mdtlbl.vim

@@ -27,11 +27,12 @@ syn case match
 " 一些关键字 {{{1
 syn keyword mdtlblKeyword
             \ while gwhile do skip if elif else switch gswitch break continue
-            \ const take setres select match
+            \ const setres select match
             \ inline
             \ op noop print
 syn keyword mdtlblKeyword goto nextgroup=mdtlblIdentLabelRest
 syn keyword mdtlblKeyword case nextgroup=mdtlblStar skipwhite
+syn keyword mdtlblKeyword take nextgroup=mdtlblStar skipwhite
 syn match mdtlblStar /\*/ contained
 
 syn keyword mdtlblOpFunKeyword

tools/parser/Cargo.toml

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

tools/parser/src/parser.lalrpop

@@ -921,25 +921,53 @@ pub BuiltinCommand: LogicLine = {
         )
     },
 
-    "take"
-    <mut takes:(<(<ConstKey> "=")?> <Value>)+>
-    LEnd => {
-        if takes.len() == 1 {
-            let (res, value) = takes.pop().unwrap();
-            let res = res.unwrap_or_else(|| meta.unnamed_var().into());
-            return Take(res, value).into();
+    "take" <lines:TakeAtom+> LEnd => {
+        if lines.len() == 1 {
+            lines.into_iter().next().unwrap()
+        } else {
+            InlineBlock(lines).into()
         }
-        let mut lines = Vec::with_capacity(takes.len());
-        for (res, value) in takes.into_iter() {
-            let res = res.unwrap_or_else(|| meta.unnamed_var().into());
-            let take = Take(res, value);
-            lines.push(take.into())
+    },
+
+    "take" "*" <inner:TakeOpExprMultInner> LEnd => {
+        let (keys, vals) = inner;
+        assert_eq!(keys.len(), vals.len());
+
+        let lines = keys.into_iter()
+            .rev()
+            .zip(vals)
+            .map(|(key, val)| {
+                Take(key, val).into()
+            })
+            .collect::<Vec<LogicLine>>();
+
+        if lines.len() == 1 {
+            lines.into_iter().next().unwrap()
+        } else {
+            InlineBlock(lines).into()
         }
-        InlineBlock(lines).into()
     },
 
     "setres" <Value> LEnd => LogicLine::SetResultHandle(<>),
 }
+TakeOpExprMultInner: (Vec<ConstKey>, Vec<Value>) = {
+    <key:ConstKey> "=" <val:OpExprBodyToValue> => (vec![key], vec![val]),
+    <key:ConstKey> "," <mut inner:TakeOpExprMultInner> "," <val:OpExprBodyToValue> => {
+        inner.0.push(key);
+        inner.1.push(val);
+        inner
+    },
+}
+#[inline]
+TakeAtom: LogicLine = {
+    "+" <key:ConstKey> => {
+        Take(key, DExp::new_nores(vec![].into()).into()).into()
+    },
+    <key:(<ConstKey> "=")?> <val:Value> => {
+        let key = key.unwrap_or_else(|| meta.unnamed_var().into());
+        Take(key, val).into()
+    },
+}
 
 BlockExpand: Expand = MBlock<Expand> => <>;
 pub Block: LogicLine = BlockExpand => <>.into();

tools/parser/tests/Cargo.toml

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

tools/parser/tests/src/lib.rs

@@ -883,6 +883,20 @@ fn take_test() {
                "print 2",
                "print 2",
     ]);
+
+    assert_eq!(
+        parse!(parser, r#"
+        take+A+B+C+D;
+        "#).unwrap(),
+        parse!(parser, r#"
+        inline {
+            take A = ();
+            take B = ();
+            take C = ();
+            take D = ();
+        }
+        "#).unwrap(),
+    );
 }
 
 #[test]
@@ -2647,6 +2661,17 @@ fn op_expr_test() {
         print (__: setres i; $ = $ + `1`;);
         "#).unwrap(),
     );
+
+    assert_eq!(
+        parse!(parser, r#"
+        take*A, B = x+y, i++;
+        take*C = j--;
+        "#).unwrap(),
+        parse!(parser, r#"
+        take A = (*x+y) B = (*i++);
+        take C = (*j--);
+        "#).unwrap(),
+    );
 }
 
 #[test]