为闭包增加捕获标签的能力，并小修整关于颜色输出

Cargo.toml

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

examples/closured_value.mdtlbl

@@ -10,6 +10,10 @@
 * 有省略语法糖, 可以使用`A`表示`A:A`, 使用`&B`表示`&B:B`
 *
 * 语法起始处使用圆括号接方括号, 方括号内是捕获表, 方括号结束后接着一个值
+*
+* 在0.16.10添加了对label的捕获, 终于不用怕内层label和外层的同名了
+* 使用方法在捕获的参数那里添加一个竖线, 然后在右边编写捕获的label
+* 比如`([A B | :x](goto :x;))`
 *#
 
 const A = (a: print "makeA";);
@@ -54,3 +58,41 @@ const Clos.V = (
 print "inited";
 print "do";
 take Clos.V;
+
+
+# 使用闭包捕获标记, 不会被内层跳转影响
+const F = (
+    const Run = (const match @ {
+        F {
+            :x
+            print "unexpected";
+            take F[];
+        }
+    });
+
+    :x
+    print "expected";
+
+    take Run[([| :x](
+        goto :x;
+    ))];
+);
+take F F; # 这里证明它不会被展开标签重命名破坏
+#* >>>
+print "expected"
+print "unexpected"
+jump 0 always 0 0
+print "expected"
+print "unexpected"
+jump 3 always 0 0
+*#
+# 可以看到, 并没有跳到Run里面的:x, 而是闭包捕获到的
+# 如果我们将闭包去掉的话, 会得到我们不希望看到的, 如下
+#* >>>
+print "expected"
+print "unexpected"
+jump 1 always 0 0
+print "expected"
+print "unexpected"
+jump 4 always 0 0
+*#

src/main.rs

@@ -40,9 +40,9 @@ macro_rules! err {
     ( $($args:tt)* ) => {{
         let str = format!($($args)*);
         let mut iter = str.lines();
-        eprintln!("\x1b[1;31mMainError: {}\x1b[0m", iter.next().unwrap());
+        eprintln!("\x1b[1;31mMainError: {}\x1b[22;39m", iter.next().unwrap());
         for line in iter {
-            eprintln!("    \x1b[1;31m{}\x1b[0m", line);
+            eprintln!("    \x1b[1;31m{}\x1b[22;39m", line);
         }
     }};
 }

syntax/vim/mdtlbl.vim

@@ -73,11 +73,8 @@ syn match mdtlblDefineResultHandle /\%(([%?]\=\%(\s\|#\*.*\*#\|\%(#[^*].*\|#\)\=
 syn match mdtlblQuickDExpTakeIdent /\I\i*\%(\[\)\@=/
 syn match mdtlblQuickDExpTakeIdent /'[^' \t]\+'\%(\[\)\@=/
 syn match mdtlblQuickDExpTakeIdent /->/
-syn match mdtlblIdentLabel /:\I\i*/
-syn match mdtlblIdentLabel /:@\I\i*\%(-\i*\)*/
-syn match mdtlblIdentLabel /:'[^' \t]\+'/
-syn match mdtlblIdentLabel /:\v0%(x-=%(_)@![0-9a-fA-F_]+|x-=%(_)@![01_]+)/
-syn match mdtlblIdentLabel /:\v-=%(_)@![0-9_]+/
+syn match mdtlblIdentLabel /\v%(\w@1<!|%(goto)@4<=)%(:%(\I\i*|\@\I\i*%(-\i*)*|'[^' \t]+'|0%(x-=%(_)@![0-9a-fA-F_]+|x-=%(_)@![01_]+)|-=%(_)@![0-9_]+))+%(:"@=)=/
+syn match mdtlblIdentLabel /\v%(\w@1<!|%(goto)@4<=):"@=/
 
 " Fold {{{1
 setlocal foldmethod=syntax

tools/display_source/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "display_source"
-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/display_source/src/impls.rs

@@ -50,6 +50,7 @@ impl DisplaySource for ClosuredValue {
         match self {
             ClosuredValue::Uninit {
                 catch_values,
+                catch_labels,
                 value,
                 labels,
             } => {
@@ -60,13 +61,25 @@ impl DisplaySource for ClosuredValue {
                     },
                     catch_values,
                 );
+                if !catch_labels.is_empty() {
+                    if !catch_values.is_empty() {
+                        meta.add_space();
+                    }
+                    meta.push("|");
+                    for label in catch_labels {
+                        meta.add_space();
+                        meta.push(":");
+                        label.display_source(meta);
+                    }
+                }
                 meta.push("]");
                 value.display_source(meta);
                 inline_labs(labels, meta);
                 meta.push(")");
             },
             ClosuredValue::Inited {
                 bind_handle,
+                rename_labels,
                 vars,
             } => {
                 struct CatchedVar<'a>(&'a Var);
@@ -80,15 +93,27 @@ impl DisplaySource for ClosuredValue {
                     }
                 }
                 let catcheds = vars.iter()
-                    .map(|var| CatchedVar(var))
-                    .collect::<Vec<_>>();
+                    .map(|var| CatchedVar(var));
                 meta.push("([");
                 meta.display_source_iter_by_splitter(
                     |meta| {
                         meta.add_space();
                     },
-                    &catcheds,
+                    catcheds,
                 );
+                if !rename_labels.is_empty() {
+                    if !vars.is_empty() {
+                        meta.add_space();
+                    }
+                    meta.push("|");
+                    for (src, dst) in rename_labels {
+                        meta.add_space();
+                        meta.push(":");
+                        src.display_source(meta);
+                        meta.push("->:");
+                        dst.display_source(meta);
+                    }
+                }
                 meta.push("]");
                 bind_handle.display_source(meta);
                 meta.push(")");
@@ -1060,4 +1085,22 @@ fn display_source_test() {
         }\
         "
     );
+
+    assert_eq!(
+        parse!(line_parser, r#"
+        const X = ([| :c :d]2);
+        "#)
+            .unwrap()
+            .display_source_and_get(&mut meta),
+        "const X = ([| :c :d]2);"
+    );
+
+    assert_eq!(
+        parse!(line_parser, r#"
+        const X = ([A B | :c :d]2);
+        "#)
+            .unwrap()
+            .display_source_and_get(&mut meta),
+        "const X = ([A:A B:B | :c :d]2);"
+    );
 }

tools/display_source/src/lib.rs

@@ -168,7 +168,7 @@ impl DisplaySourceMeta {
     pub fn display_source_iter_by_splitter<'a, T: DisplaySource + 'a>(
         &mut self,
         mut split: impl FnMut(&mut Self),
-        iter: impl IntoIterator<Item = &'a T>
+        iter: impl IntoIterator<Item = T>
     ) {
         let mut iter = iter.into_iter();
         if let Some(s) = iter.next() {
@@ -202,6 +202,16 @@ where T: DisplaySource
         T::display_source_and_get(&self, meta)
     }
 }
+impl<T> DisplaySource for &'_ mut T
+where T: DisplaySource
+{
+    fn display_source(&self, meta: &mut DisplaySourceMeta) {
+        T::display_source(self, meta)
+    }
+    fn display_source_and_get<'a>(&self, meta: &'a mut DisplaySourceMeta) -> &'a str {
+        T::display_source_and_get(&self, meta)
+    }
+}
 
 #[cfg(test)]
 mod tests {

tools/logic_lint/Cargo.toml

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

tools/logic_lint/src/lints.rs

@@ -14,7 +14,7 @@ macro_rules! color_str {
             $(";", stringify!($num), )*
             "m",
             $str,
-            "\x1b[0m",
+            "\x1b[22;39m",
         )
     };
 }

tools/parser/Cargo.toml

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

tools/parser/src/parser.lalrpop

@@ -860,10 +860,17 @@ ClosuredValueCatch: ClosuredValueMethod = {
         => Const(name.into(), val, labels).into(),
 }
 ClosuredValue: ClosuredValue = {
-    MLTuple<ClosuredValueCatch*, (ConstStart <Value> <ConstStop>)> => {
-        let (catchs, (value, labels)) = <>;
+    MLTuple<
+        (
+            ClosuredValueCatch*
+            ("|" <Label*>)?
+        ),
+        (ConstStart <Value> <ConstStop>),
+    > => {
+        let ((catchs, catch_labels), (value, labels)) = <>;
         ClosuredValue::Uninit {
             catch_values: catchs,
+            catch_labels: catch_labels.unwrap_or_default(),
             value: value.into(),
             labels,
         }

tools/parser/tests/Cargo.toml

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