修复const-match中运行守卫会破坏外部参数

Cargo.toml

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

tools/parser/tests/Cargo.toml

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

tools/parser/tests/src/lib.rs

@@ -6076,6 +6076,18 @@ fn const_match_test() {
             "end",
         ],
     );
+
+    // 测试守卫作用域
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        const match 1 { [?_0 == 1] { x; } _ { y; }}
+        print _0 @;
+        "#).unwrap()).compile().unwrap(),
+        vec![
+            "x",
+            "print _0",
+        ],
+    );
 }
 
 #[test]

tools/syntax/Cargo.toml

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

tools/syntax/src/lib.rs

@@ -3304,7 +3304,7 @@ impl ConstMatchPatAtom {
             },
             Either::Right(guard) => {
                 let mut res = false;
-                meta.with_block(|meta| {
+                meta.with_block_and_env_args(|meta| {
                     LogicLine::SetArgs([handle.into()].into())
                         .compile(meta);
                     res = guard.take_handle(meta).ne("0")