diff --git a/doc/design/occlusion-syntax.md b/doc/design/occlusion-syntax.md index 0bc1bcd..87a5d68 100644 --- a/doc/design/occlusion-syntax.md +++ b/doc/design/occlusion-syntax.md @@ -439,9 +439,22 @@ T1 刻意"不重复",因此需要**闭合**: |---|------|------|------|------| ## 13.1 实施进度 -已完成:M0 · M1 · M2 · M2.5 · M3 · M4 · M5 · M6 · M9 · M10(每步含变更文档与测试)。 +**全部完成**:M0 · M1 · M2 · M2.5 · M3 · M4 · M5 · M6 · M7 · M8 · M9 · M10 +(每步含变更文档与测试;全量 605 passed / 0 failed;0 编译警告)。 -待做:**M7**(迁移 + 版本门)、**M8**(呈现与门禁)。 +| 里程碑 | 变更文档 | +|--------|---------| +| M1 | [change-m1-paren-call.md](change-m1-paren-call.md) | +| M2 | [change-m2-occlusion.md](change-m2-occlusion.md) | +| M2.5 | [change-m25-label-diagnostics.md](change-m25-label-diagnostics.md) | +| M3 | [change-m3-access-and-loop.md](change-m3-access-and-loop.md) | +| M4 | [change-m4-label-refs.md](change-m4-label-refs.md) | +| M5 | [change-m5-implicit-occlusion.md](change-m5-implicit-occlusion.md) | +| M6 | [change-m6-t1-session.md](change-m6-t1-session.md) | +| M7 | [change-m7-migration.md](change-m7-migration.md) | +| M8 | [change-m8-ratchet.md](change-m8-ratchet.md) | +| M9 | [change-m9-label-search.md](change-m9-label-search.md) | +| M10 | [change-m10-engineering-habits.md](change-m10-engineering-habits.md) | | **M0** | 语义冻结 | 本文档 Accepted + 术语表进 `doc/design/` | — | 无 | | **M1** | `()` 内调用增强 | `callee(args)`:`)` 终止、逗号、嵌套、**空格 callee** | M0 | 中(分词器共享) | diff --git a/src/main.rs b/src/main.rs index 5beef24..3fcc9a6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -119,9 +119,9 @@ enum Commands { }, /// Occlusion label queries: pending stubs (built-in words) or keyword search Labels { - /// File or directory (recursively scans `*.mq.md`) + /// Files or directories (recursively scans `*.mq.md`) #[arg(value_name = "PATH", default_value = ".")] - path: PathBuf, + paths: Vec, /// Keywords (comma separated). Replaces the built-in pending set. #[arg(long, value_name = "WORDS")] @@ -597,7 +597,7 @@ fn try_main(cli: Cli) -> Result { Ok(errors.min(1)) } Commands::Labels { - path, + paths, grep, also_builtin, group, @@ -628,7 +628,12 @@ fn try_main(cli: Cli) -> Result { } } - let files = collect_mq_files(&path)?; + let mut files: Vec = Vec::new(); + for p in &paths { + files.extend(collect_mq_files(p)?); + } + files.sort(); + files.dedup(); let mut rows: Vec<(String, u32, String, String, Vec, bool)> = Vec::new(); for f in &files { let module = match marqdo::load::load_module(f) {