添加(*++i)语法, 与(?++i)不同的是它直接取得值

Cargo.toml

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

examples/op_expr.mdtlbl

@@ -55,6 +55,8 @@
 * 注意, 结果带值而非运算的三元表达式最好写在顶层, 不然可能出现不必要的赋值
 *
 * 在0.14.21版本中, 添加了一个语法糖, 可以用 `(?x: a+b)` 来表示 `(x: $=a+b;)`
+* 而在0.16.19版本中, 增加了简单的`(*a+b)`, 和`(?a+b)`区别在于它直接尝试展开成值
+* 这样在例如`++i`的时候可以不用看到不想要的set, `(*++i)`和`(?++i)`
 *#
 
 x = 1 + 2 * 3;

tools/parser/Cargo.toml

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

tools/parser/src/parser.lalrpop

@@ -200,6 +200,7 @@ NonConstRangeValue: Value = {
 pub Value: Value = {
     NonConstRangeValue,
     DExp => <>.into(),
+    OpExprToValue,
     // consted-dexp
     "const" ConstStart <value:Or<ValueDExp, ("!" <Value>)>> <labels:ConstStop> => {
         let tmp_name = meta.get_tmp_var();
@@ -581,7 +582,12 @@ OpExprBodySetR: Expand = OpExprBody => {
     );
     vec![line].into()
 };
+#[inline]
+OpExprBodyToValue: Value = OpExprBody => {
+    <>.into_value(meta)
+};
 OpExprDExp: DExp = METuple<MakeDExpBody<OpExprBodySetR>>;
+OpExprToValue: Value = MTuple<("*" <OpExprBodyToValue>)>;
 
 OpExprAssignOper: OpExprAOperFun = {
     "+="  => { |meta, res, v| { let tres = meta.get_tmp_var(); Expand(vec![Take(tres.clone().into(), res).into(), Op::Add (tres.clone().into(), tres.into(), v.into_value(meta)).into()]).into() } },

tools/parser/tests/Cargo.toml

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

tools/parser/tests/src/lib.rs

@@ -2629,6 +2629,24 @@ fn op_expr_test() {
         );
         "#).unwrap(),
     );
+
+    assert_eq!(
+        parse!(parser, r#"
+        print (?++i);
+        "#).unwrap(),
+        parse!(parser, r#"
+        print ($ = (__: setres i; $ = $ + `1`;););
+        "#).unwrap(),
+    );
+
+    assert_eq!(
+        parse!(parser, r#"
+        print (*++i);
+        "#).unwrap(),
+        parse!(parser, r#"
+        print (__: setres i; $ = $ + `1`;);
+        "#).unwrap(),
+    );
 }
 
 #[test]