为do_while goto添加了未填写条件时的默认值

Cargo.toml

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

src/syntax.rs

@@ -5484,7 +5484,7 @@ mod tests {
     }
 
     #[test]
-    fn test_op_expr_if_else() {
+    fn op_expr_if_else_test() {
         let parser = TopLevelParser::new();
 
         assert_eq!(
@@ -5564,4 +5564,34 @@ mod tests {
         );
 
     }
+
+    #[test]
+    fn optional_jumpcmp_test() {
+        let parser = TopLevelParser::new();
+
+        assert_eq!(
+            parse!(parser, r#"
+            :x
+            goto :x;
+            "#).unwrap(),
+            parse!(parser, r#"
+            :x
+            goto :x _;
+            "#).unwrap()
+        );
+
+        assert_eq!(
+            parse!(parser, r#"
+            do {
+                foo;
+            } while;
+            "#).unwrap(),
+            parse!(parser, r#"
+            do {
+                foo;
+            } while _;
+            "#).unwrap()
+        );
+
+    }
 }

src/syntax_def.lalrpop

@@ -166,6 +166,9 @@ JumpCmpBody: JumpCmp = {
 
 pub JumpCmp: CmpTree = CmpTree1;
 
+// 可空的, 空时为总是的条件
+AlwaysJumpCmp: CmpTree = JumpCmp? => <>.unwrap_or(JumpCmp::Always.into());
+
 pub CmpTree1: CmpTree = {
     <a:CmpTree1> "||" <b:CmpTree2> => CmpTree::Or(Box::new(a.into()), b.into()),
     CmpTree2,
@@ -586,20 +589,16 @@ SwitchCatchFlag: SwitchCatch = {
 }
 
 pub Control: LogicLine = {
-    "goto" <Label> <JumpCmp> LEnd => Goto(<>).into(),
+    "goto" <Label> <AlwaysJumpCmp> LEnd => {
+        Goto(<>).into()
+    },
 
-    "break" <JumpCmp?> LEnd => {
-        Goto(
-            meta.get_break().clone(),
-            <>.unwrap_or(JumpCmp::Always.into()),
-        ).into()
+    "break" <AlwaysJumpCmp> LEnd => {
+        Goto(meta.get_break().clone(), <>).into()
     },
 
-    "continue" <JumpCmp?> LEnd => {
-        Goto(
-            meta.get_continue().clone(),
-            <>.unwrap_or(JumpCmp::Always.into()),
-        ).into()
+    "continue" <AlwaysJumpCmp> LEnd => {
+        Goto(meta.get_continue().clone(), <>).into()
     },
 
     "skip" <cmp:JumpCmp> <body:LogicLine> => {
@@ -632,7 +631,7 @@ pub Control: LogicLine = {
         Expand(res).into()
     },
 
-    "do" CtrlStart <body:Block> <ctrl:CtrlStop> "while" <cmp:JumpCmp> LEnd => {
+    "do" CtrlStart <body:Block> <ctrl:CtrlStop> "while" <cmp:AlwaysJumpCmp> LEnd => {
         let (break_lab, continue_lab) = ctrl;
         let head = meta.get_tag();
         let mut res = Vec::with_capacity(5);

syntax/vim/mdtlbl.snippets

@@ -14,7 +14,7 @@ do {
 } while ${1};
 endsnippet
 snippet goto "goto" w
-goto :${1:tag} ${2:_};$0
+goto :${1:tag} ${2};$0
 endsnippet
 snippet skip "skip" w
 skip ${1} {