From cf45c5c6552103afcc9a1e134c86f26b993655a1 Mon Sep 17 00:00:00 2001
From: A4-Tacks <wdsjxhno1001@163.com>
Date: Sat, 28 Oct 2023 00:32:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86control-block,=20?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=AE=80=E5=8D=95=E7=9A=84=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?break=E5=92=8Ccontinue=E7=9A=84=E7=9B=AE=E6=A0=87=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.lock                    |   2 +-
 Cargo.toml                    |   2 +-
 examples/README.md            |   1 +
 examples/control_block.mdtlbl |  31 ++++++
 src/syntax/def.lalrpop        |  36 +++++++
 src/syntax/mod.rs             |  27 ++++-
 src/syntax/tests.rs           | 194 ++++++++++++++++++++++++++++++++++
 7 files changed, 286 insertions(+), 7 deletions(-)
 create mode 100644 examples/control_block.mdtlbl

diff --git a/Cargo.lock b/Cargo.lock
index eee135a..5ebfcc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -288,7 +288,7 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "mindustry_logic_bang_lang"
-version = "0.12.7"
+version = "0.12.8"
 dependencies = [
  "display_source",
  "lalrpop",
diff --git a/Cargo.toml b/Cargo.toml
index 21b4bb7..9c7c1ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mindustry_logic_bang_lang"
-version = "0.12.7"
+version = "0.12.8"
 edition = "2021"
 
 authors = ["A4-Tacks <wdsjxhno1001@163.com>"]
diff --git a/examples/README.md b/examples/README.md
index 20d9469..19970e9 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -12,6 +12,7 @@
 > [`op_expr.mdtlbl`](./op_expr.mdtlbl)<br/>
 > [`control.mdtlbl`](./control.mdtlbl)<br/>
 > [`control_plus.mdtlbl`](./control_plus.mdtlbl)<br/>
+> [`control_block.mdtlbl`](./control_block.mdtlbl)<br/>
 > [`cmps.mdtlbl`](./cmps.mdtlbl)<br/>
 > [`insert_sort.mdtlbl`](./insert_sort.mdtlbl)<br/>
 > [`switch.mdtlbl`](./switch.mdtlbl)<br/>
diff --git a/examples/control_block.mdtlbl b/examples/control_block.mdtlbl
new file mode 100644
index 0000000..a5ab620
--- /dev/null
+++ b/examples/control_block.mdtlbl
@@ -0,0 +1,31 @@
+#**
+* 这是0.12.8加入的功能, 可以自定义break和continue的跳出点.
+* 语法为(("break" | "continue") "!"?)+ Block
+* 其中编写break就是表示捕获break至块末尾,
+* 编写continue就是表示捕获continue至块末尾.
+*
+* 当break或者continue后方加上了叹号时, 将反转其跳转点,
+* 例如`break! { ... }`内部使用break会跳转到块首部,
+* 也就是应该continue跳转到的位置.
+*#
+
+i = 0;
+while i < 10 {
+    continue! {
+        getlink block i;
+        continue !(sensor $ block @enabled;);
+    }
+    op i i + 1;
+}
+#* >>>
+set i 0
+jump 0 greaterThanEq i 10
+getlink block i
+sensor __0 block @enabled
+jump 5 equal __0 false
+op add i i 1
+jump 2 lessThan i 10
+*#
+# 可以看到, 控制块中的continue被导向了i自加处,
+# 这样就可以在循环等结构中简单的定义break和continue的导向处了
+# 合理使用可以增加一些可读性等
diff --git a/src/syntax/def.lalrpop b/src/syntax/def.lalrpop
index b53571b..b966d5d 100644
--- a/src/syntax/def.lalrpop
+++ b/src/syntax/def.lalrpop
@@ -70,7 +70,12 @@ OOCArgs<T, S>: Vec<T> = {
 }
 Span<T> = @L T @R;
 
+CtrlBreakStart: () = () => meta.add_control_break_level(None);
+CtrlContinueStart: () = () => meta.add_control_continue_level(None);
 CtrlStart: () = () => meta.add_control_level(None, None);
+
+CtrlBreakStop: Option<Var> = () => meta.pop_control_break_level();
+CtrlContinueStop: Option<Var> = () => meta.pop_control_continue_level();
 CtrlStop: (Option<Var>, Option<Var>) = () => meta.pop_control_level();
 
 pub TopLevel: Expand = CtrlStart <mut lines:Expand> <ctrl:CtrlStop> => {
@@ -594,6 +599,35 @@ SwitchCatchFlag: SwitchCatch = {
     MTuple<JumpCmp> => SwitchCatch::UserDefine(<>),
 }
 
+ControlBlock: Expand = {
+    "break" <bang:"!"?>
+    CtrlBreakStart <lines:Or<ControlBlock, BlockExpand>> <ctrl:CtrlBreakStop>
+    => {
+        let mut res = Vec::with_capacity(2);
+        if bang.is_none() {
+            res.push(lines.into());
+            meta.push_some_label_to(&mut res, ctrl);
+        } else {
+            meta.push_some_label_to(&mut res, ctrl);
+            res.push(lines.into());
+        }
+        res.into()
+    },
+    "continue" <bang:"!"?>
+    CtrlContinueStart <lines:Or<ControlBlock, BlockExpand>> <ctrl:CtrlContinueStop>
+    => {
+        let mut res = Vec::with_capacity(2);
+        if bang.is_none() {
+            meta.push_some_label_to(&mut res, ctrl);
+            res.push(lines.into());
+        } else {
+            res.push(lines.into());
+            meta.push_some_label_to(&mut res, ctrl);
+        }
+        res.into()
+    },
+}
+
 pub Control: LogicLine = {
     "goto" <Label> <AlwaysJumpCmp> LEnd => {
         Goto(<>).into()
@@ -607,6 +641,8 @@ pub Control: LogicLine = {
         Goto(meta.get_continue().clone(), <>).into()
     },
 
+    ControlBlock => <>.into(),
+
     "skip" <cmp:JumpCmp> <body:LogicLine> => {
         let lab = meta.get_tag();
         Expand(vec![
diff --git a/src/syntax/mod.rs b/src/syntax/mod.rs
index a83e205..771d4b2 100644
--- a/src/syntax/mod.rs
+++ b/src/syntax/mod.rs
@@ -509,15 +509,32 @@ impl Meta {
         self.defined_labels.pop().unwrap()
     }
 
+    pub fn add_control_break_level(&mut self, r#break: Option<Var>) {
+        self.break_labels.push(r#break);
+    }
+
+    pub fn add_control_continue_level(&mut self, r#continue: Option<Var>) {
+        self.continue_labels.push(r#continue);
+    }
+
     /// 添加一层用于`break`和`continue`的未使用控制层
     ///
     /// 需要在结构结束时将其销毁
     pub fn add_control_level(
-        &mut self, r#break: Option<Var>,
+        &mut self,
+        r#break: Option<Var>,
         r#continue: Option<Var>,
     ) {
-        self.break_labels.push(r#break);
-        self.continue_labels.push(r#continue);
+        self.add_control_break_level(r#break);
+        self.add_control_continue_level(r#continue);
+    }
+
+    pub fn pop_control_break_level(&mut self) -> Option<Var> {
+        self.break_labels.pop().unwrap()
+    }
+
+    pub fn pop_control_continue_level(&mut self) -> Option<Var> {
+        self.continue_labels.pop().unwrap()
     }
 
     /// 将`break`和`continue`的标签返回
@@ -525,8 +542,8 @@ impl Meta {
     /// 如果未使用那么返回的会为空
     pub fn pop_control_level(&mut self) -> (Option<Var>, Option<Var>) {
         (
-            self.break_labels.pop().unwrap(),
-            self.continue_labels.pop().unwrap(),
+            self.pop_control_break_level(),
+            self.pop_control_continue_level(),
         )
     }
 
diff --git a/src/syntax/tests.rs b/src/syntax/tests.rs
index bc34efd..77519e7 100644
--- a/src/syntax/tests.rs
+++ b/src/syntax/tests.rs
@@ -3097,3 +3097,197 @@ fn optional_jumpcmp_test() {
     );
 
 }
+
+#[test]
+fn control_block_test() {
+    let parser = TopLevelParser::new();
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        a;
+        break {
+            b;
+            break;
+            c;
+        }
+        d;
+        break;
+        "#).unwrap()).compile().unwrap(),
+        [
+            "a",
+            "b",
+            "jump 4 always 0 0",
+            "c",
+            "d",
+            "jump 0 always 0 0",
+        ]
+    );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        a;
+        break! {
+            b;
+            break;
+            c;
+        }
+        d;
+        break;
+        "#).unwrap()).compile().unwrap(),
+        [
+            "a",
+            "b",
+            "jump 1 always 0 0",
+            "c",
+            "d",
+            "jump 0 always 0 0",
+        ]
+    );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        a;
+        continue {
+            b;
+            continue;
+            c;
+        }
+        d;
+        continue;
+        "#).unwrap()).compile().unwrap(),
+        [
+            "a",
+            "b",
+            "jump 1 always 0 0",
+            "c",
+            "d",
+            "jump 0 always 0 0",
+        ]
+    );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        a;
+        continue! {
+            b;
+            continue;
+            c;
+        }
+        d;
+        continue;
+        "#).unwrap()).compile().unwrap(),
+        [
+            "a",
+            "b",
+            "jump 4 always 0 0",
+            "c",
+            "d",
+            "jump 0 always 0 0",
+        ]
+    );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        a;
+        continue {
+            b;
+            break;
+            c;
+        }
+        d;
+        continue;
+        "#).unwrap()).compile().unwrap(),
+        [
+            "a",
+            "b",
+            "jump 0 always 0 0",
+            "c",
+            "d",
+            "jump 0 always 0 0",
+        ]
+    );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        a;
+        break {
+            b;
+            continue;
+            c;
+        }
+        d;
+        break;
+        "#).unwrap()).compile().unwrap(),
+        [
+            "a",
+            "b",
+            "jump 0 always 0 0",
+            "c",
+            "d",
+            "jump 0 always 0 0",
+        ]
+    );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        a;
+        break continue {
+            b;
+            continue;
+            break;
+            c;
+        }
+        d;
+        "#).unwrap()).compile().unwrap(),
+        [
+            "a",
+            "b",
+            "jump 1 always 0 0",
+            "jump 5 always 0 0",
+            "c",
+            "d",
+        ]
+    );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        a;
+        continue break {
+            b;
+            continue;
+            break;
+            c;
+        }
+        d;
+        "#).unwrap()).compile().unwrap(),
+        [
+            "a",
+            "b",
+            "jump 1 always 0 0",
+            "jump 5 always 0 0",
+            "c",
+            "d",
+        ]
+    );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        a;
+        continue! break! {
+            b;
+            break;
+            continue;
+            c;
+        }
+        d;
+        "#).unwrap()).compile().unwrap(),
+        [
+            "a",
+            "b",
+            "jump 1 always 0 0",
+            "jump 5 always 0 0",
+            "c",
+            "d",
+        ]
+    );
+}