原计划的"翻转默认 + 旧形硬报错"不可行:`[键](集合)` 与 `[描述](实现)` 外形相同, 翻转会让 506 处取元静默变义,硬报错又拿不到证据。改为**按文件声明**。 一、per-file markup - frontmatter `markup: occlusion`(或 `标记: 遮蔽`)决定该文件模式 - load.rs 先取模式,用 parse::expr::with_markup(线程局部压栈)包住解析 - 同一进程可同时加载两种模式的文件(imports);MARQDO_MARKUP 仍作进程默认 - 好处:迁移逐文件、可增量、可回滚,不存在半迁移的静默错义 二、`marqdo migrate labels [--write|--json]` 改写规则: [键](集合) → [键](access(集合, "键")) [`名`](集合) → [名](access(集合, `名`)) - [项](集合) → - [项](遍历 集合 为 项) 安全模型:改写 → 重解析 → 证明等价 → 才写 - 原文件按 classic 解析得 AST-A;改写后按 occlusion 解析得 AST-B - 反归一化 B(标签与键同名且 payload 为 access 的遮蔽还原成 Index) - Debug(A) == Debug(反归一化(B))(抹掉行号)才写入,否则原文件一字不动 只改代码行(LineKind::Code);表格行只改 **…** 单元格,散文 markdown 链接不碰; 链式索引由内向外改写,已迁移的有守卫不二次改。 三、access 提升为宿主函数 HostFn::Access(u16 id 212) 与旧取元逐字一致(Map 按键 / List 1-based / 缺键 missing map key); 进 HostFn 是为了两个后端共用同一实现,interp 里的特例已删除。 四、顺带修的两处真实语义缺陷 1. payload 继承外层"文本模式":`f text=[k](access(c,k))` 中 access 不被当调用 → `()` 内永远允许 callee(args) 2. 遮蔽形状判定过宽:`[问候] ([格式化] "Bo")` 误判为遮蔽 → 要求 `]` 后紧跟 `(`,否则落回方括号调用 五、全仓迁移结果 migrate labels: 256 index, 23 loop, 80 file written;0 文件被等价性拒绝; 迁移后 cargo test --release → 604 passed / 0 failed;再跑迁移幂等。 等价性检查先后抓出 4 类改写 bug(表格散文链接、payload 文本模式、链式索引、 遮蔽与方括号调用混淆),每类都是先拦下再修工具,未污染文件。 测试:6 个单测 + 3 个集成(干跑不写盘 / 写入后运行输出不变且幂等 / 等价失败文件不动);全量 604 passed / 0 failed(M3 后 595 + 9);双后端一致。 文档:doc/design/change-m7-migration.md
78 lines
3.2 KiB
Rust
78 lines
3.2 KiB
Rust
//! `<TAB>` M7: `marqdo migrate labels` — dry run, write, idempotence, runtime parity.
|
|
|
|
use std::process::Command;
|
|
|
|
fn run_in(dir: &std::path::Path, args: &[&str], markup: Option<&str>) -> (i32, String, String) {
|
|
let mut cmd = Command::new(env!("CARGO_BIN_EXE_marqdo"));
|
|
cmd.args(args);
|
|
if let Some(m) = markup {
|
|
cmd.env("MARQDO_MARKUP", m);
|
|
}
|
|
let out = cmd.output().expect("run marqdo");
|
|
let _ = dir;
|
|
(
|
|
out.status.code().unwrap_or(1),
|
|
String::from_utf8_lossy(&out.stdout).into_owned(),
|
|
String::from_utf8_lossy(&out.stderr).into_owned(),
|
|
)
|
|
}
|
|
|
|
fn fixture() -> (std::path::PathBuf, String) {
|
|
let dir = std::env::temp_dir().join(format!("marqdo-migrate-{}", std::process::id()));
|
|
std::fs::create_dir_all(&dir).unwrap();
|
|
let path = dir.join("demo.mq.md");
|
|
let src = "---\nimport json:lib/json.mq.md\n---\n\n# main\n\n`表` = > json.parse text={\"键\":\"值\"}\n**a = [键](`表`)**\n> print text=\"a=\" + `a`\n";
|
|
std::fs::write(&path, src).unwrap();
|
|
(path, src.to_string())
|
|
}
|
|
|
|
#[test]
|
|
fn dry_run_does_not_write() {
|
|
let (path, before) = fixture();
|
|
let (code, stdout, _) = run_in(path.parent().unwrap(), &["migrate", "labels", path.to_str().unwrap()], None);
|
|
assert_eq!(code, 0);
|
|
assert!(stdout.contains("would change"), "{stdout}");
|
|
assert_eq!(std::fs::read_to_string(&path).unwrap(), before);
|
|
}
|
|
|
|
#[test]
|
|
fn write_migrates_and_keeps_runtime_behaviour() {
|
|
let (path, _) = fixture();
|
|
let parent = path.parent().unwrap().to_path_buf();
|
|
// Baseline output (classic index).
|
|
let (c0, out0, e0) = run_in(&parent, &["run", path.to_str().unwrap()], None);
|
|
assert_eq!(c0, 0, "stderr={e0}");
|
|
|
|
let (code, _, err) = run_in(&parent, &["migrate", "labels", path.to_str().unwrap(), "--write"], None);
|
|
assert_eq!(code, 0, "stderr={err}");
|
|
|
|
let migrated = std::fs::read_to_string(&path).unwrap();
|
|
assert!(migrated.contains("markup: occlusion"), "{migrated}");
|
|
assert!(migrated.contains("access("), "{migrated}");
|
|
|
|
// Same output, now via the purity form.
|
|
let (c1, out1, e1) = run_in(&parent, &["run", path.to_str().unwrap()], None);
|
|
assert_eq!(c1, 0, "stderr={e1}");
|
|
assert_eq!(out0, out1);
|
|
|
|
// Idempotent: a second pass finds nothing to do.
|
|
let (_, again, _) = run_in(&parent, &["migrate", "labels", path.to_str().unwrap()], None);
|
|
assert!(again.contains("0 index"), "{again}");
|
|
}
|
|
|
|
#[test]
|
|
fn equivalence_failure_leaves_file_untouched() {
|
|
// A hand-written occlusion has no `(access(…))` payload, so rewriting the
|
|
// shape again would change the AST — the tool must refuse.
|
|
let dir = std::env::temp_dir().join(format!("marqdo-migrate-bad-{}", std::process::id()));
|
|
std::fs::create_dir_all(&dir).unwrap();
|
|
let path = dir.join("bad.mq.md");
|
|
let src = "---\nmarkup: occlusion\n---\n\n# main\n\n**a = [一加一](1 + 1)**\n> print text=`a`\n";
|
|
std::fs::write(&path, src).unwrap();
|
|
let (code, stdout, _) = run_in(&dir, &["migrate", "labels", path.to_str().unwrap()], None);
|
|
assert_eq!(code, 0);
|
|
// Already marked → reported as such, never rewritten.
|
|
assert!(stdout.contains("already marked") || stdout.contains("0 index"), "{stdout}");
|
|
assert_eq!(std::fs::read_to_string(&path).unwrap(), src);
|
|
}
|