优化Debug的labels显示, 并且使gswitch没有控制标记时不增加块

A4-Tacks · May 9, 2024 · 4dcfc5b · 4dcfc5b
1 parent c712ab8
commit 4dcfc5b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 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.16.5"
+version = "0.16.6"
 edition = "2021"
 
 authors = ["A4-Tacks <[email protected]>"]

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

diff --git a/tools/parser/src/parser.lalrpop b/tools/parser/src/parser.lalrpop
@@ -1029,7 +1029,11 @@ ControlWithoutOptionalEnd: LogicLine = {
         let mut lines = vec![GSwitch { value, extra, cases }.into()];
         meta.push_some_label_to(&mut lines, break_lab);
         meta.push_some_label_to(&mut lines, continue_lab);
-        Expand(lines).into()
+        <[_; 1]>::try_from(lines)
+            .map(|[line]| line)
+            .unwrap_or_else(|lines| {
+                InlineBlock(lines).into()
+            })
     },
 
     "switch" <value:Value>
@@ -1104,7 +1108,7 @@ ControlWithoutOptionalEnd: LogicLine = {
                         if flag.is_misses() {
                             // 是一个未命中捕获
                             let tag = meta.get_tag();
-                            out_block.push(LogicLine::Label(tag.clone()));
+                            out_block.push(LogicLine::new_label(tag.clone(), meta));
                             fill_line = Goto(tag, JumpCmp::Always.into()).into();
                             false // 已处理, 过滤掉
                         } else {
@@ -1130,7 +1134,7 @@ ControlWithoutOptionalEnd: LogicLine = {
                 )
             }
             out_block.push(lines.into());
-            out_block.push(LogicLine::Label(skip_tag));
+            out_block.push(LogicLine::new_label(skip_tag, meta));
 
             catch_lines.push(Expand(out_block).into())
         }

diff --git a/tools/syntax/Cargo.toml b/tools/syntax/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syntax"
-version = "0.2.24"
+version = "0.2.25"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/tools/syntax/src/builtins.rs b/tools/syntax/src/builtins.rs
@@ -270,15 +270,18 @@ pub fn build_builtins() -> Vec<BuiltinFunc> {
         /// 以Debug形式显示一个值
         fn debug:Debug(meta) [v:value] {
             if let Some(ref ext) = meta.extender {
+                let mut sep = None;
                 meta.log_info(format!(
                     "Value Debug:\n\
                     binder: ..{}\n\
-                    labels: {}\n\
+                    labels: [{}]\n\
                     value: {}\
                     ",
                     value.binder.as_ref().map(|s| s.as_str()).unwrap_or(""),
                     value.labels().iter()
-                        .flat_map(|s| [s.as_str(), ", "])
+                        .flat_map(|v| sep.replace(", ")
+                            .into_iter()
+                            .chain(once(v.as_str())))
                         .into_iter_fmtter(),
                     ext.display_value(value.value()),
                 ));