添加对条件多次取反的功能

A4-Tacks · Jul 30, 2023 · e413fc7 · e413fc7
1 parent 861699a
commit e413fc7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mindustry_logic_bang_lang"
-version = "0.6.1"
+version = "0.6.2"
 edition = "2021"
 
 authors = ["A4-Tacks <[email protected]>"]

diff --git a/src/syntax.rs b/src/syntax.rs
@@ -1365,6 +1365,15 @@ mod tests {
             [r#"goto :a ! x;"#, r#"goto :a x == false;"#],
             [r#"goto :a ! _;"#, r#"goto :a 0 != 0;"#],
             [r#"goto :a lnot _;"#, r#"goto :a 0 != 0;"#],
+            // 多次取反
+            [r#"goto :a !!! x == y;"#, r#"goto :a x != y;"#],
+            [r#"goto :a !!! x != y;"#, r#"goto :a x == y;"#],
+            [r#"goto :a !!! x < y;"#, r#"goto :a x >= y;"#],
+            [r#"goto :a !!! x > y;"#, r#"goto :a x <= y;"#],
+            [r#"goto :a !!! x <= y;"#, r#"goto :a x > y;"#],
+            [r#"goto :a !!! x >= y;"#, r#"goto :a x < y;"#],
+            [r#"goto :a !!! x;"#, r#"goto :a x == false;"#],
+            [r#"goto :a !!! _;"#, r#"goto :a 0 != 0;"#],
         ];
         for [src, dst] in datas {
             assert_eq!(

diff --git a/src/syntax_def.lalrpop b/src/syntax_def.lalrpop
@@ -112,7 +112,7 @@ JumpCmpBody: JumpCmp = {
 
 pub JumpCmp: JumpCmp = {
     JumpCmpBody,
-    Or<"lnot", "!"> <JumpCmpBody> => <>.reverse(),
+    Or<"lnot", "!"> <JumpCmp> => <>.reverse(),
 }
 
 pub Op: Op = {