cflmy
11417c42e0
feat(lang): M2 遮蔽语法 [描述](实现) — 描述不执行,payload 是唯一执行体
新增 Expr::Occluded { label, payload: Option<Box<Expr>> }:
- [] 描述:自由文本,永不执行(仅用于检索/统计/过期校验)
- () 实现:唯一执行体;为空时值为 None(空载荷桩)
- 支持嵌套遮蔽、描述含空格与中文标点、\] 转义
关键决策:**模式开关,暂不切换语义**
[键](集合) 与 [描述](实现) 外形完全相同;M2 若直接改语义,全仓 506 处取元会
静默变成"遮蔽整个集合"(同形换义,文档点名的最坏一类)。
故 M2 只实现能力:
- 默认 Classic:MARQDO_MARKUP 未设 → [a](b) 仍是取元
- 纯度 Occlusion:MARQDO_MARKUP=occlusion/purity/1/on → 遮蔽
M7 才迁移语料、翻转默认、对旧形报 syntax.legacy_index 硬错误。
实现:
- ast.rs 新节点
- parse/expr.rs:Markup 枚举 + set_markup_default + parse_expr_markup(显式模式,
避免测试依赖全局) + parse_occluded(描述扫描到 ]、\] 转义、必须紧跟 (、
空载荷 → None)+ Parser.markup 字段
- interp.rs:有 payload 求值 payload,否则 None;collect_decl_reads 递归 payload
- bytecode/compile.rs:编译 payload(空则 Op::None_),双后端一致
- view/render.rs:expr_prec 渲染 [描述](payload) / [描述]()
- parse/mod.rs:pub mod expr
- main.rs:MARQDO_MARKUP 环境变量(init_markup_from_env)
测试:
- 8 个单元(值直通/空载荷/描述空格标点/转义/嵌套/classic 仍取元/缺括号报错)
- 3 个集成 tests/occlusion.rs + tests/occlusion/*.mq.md
- 全量 cargo test --release:575 passed / 0 failed(M1 后 565 + 10)
- tree 与 bytecode 双后端一致
文档:doc/design/change-m2-occlusion.md
2026-10-22 15:11:59 +08:00
..
2026-09-04 16:57:43 +08:00
2026-08-28 15:54:47 +08:00
2026-10-22 13:06:57 +08:00
2026-09-24 20:05:25 +08:00
2026-10-22 13:40:02 +08:00
2026-09-14 11:33:11 +08:00
2026-09-04 09:11:36 +08:00
2026-08-07 13:28:32 +08:00
2026-09-14 11:33:11 +08:00
2026-10-22 13:06:57 +08:00
2026-09-28 16:44:39 +08:00
2026-10-22 11:59:14 +08:00
2026-10-22 15:08:02 +08:00
2026-10-22 15:11:59 +08:00
2026-09-14 10:16:48 +08:00
2026-09-14 15:33:45 +08:00
2026-09-14 13:03:03 +08:00
2026-09-24 20:05:25 +08:00
2026-09-07 20:15:36 +08:00
2026-09-28 16:44:39 +08:00
2026-09-13 20:38:53 +08:00
2026-09-10 14:47:43 +08:00
2026-08-28 17:47:59 +08:00
2026-08-28 16:06:11 +08:00
2026-09-28 16:44:39 +08:00
2026-10-16 11:47:28 +08:00
2026-10-16 11:11:54 +08:00
2026-09-17 09:28:28 +08:00
2026-09-17 09:28:28 +08:00
2026-09-07 22:14:51 +08:00
2026-09-07 16:13:22 +08:00
2026-09-07 15:50:33 +08:00
2026-09-24 20:07:59 +08:00
2026-08-12 14:40:55 +08:00
2026-08-12 13:59:51 +08:00
2026-08-12 13:59:51 +08:00
2026-09-07 10:53:56 +08:00
2026-08-28 15:54:47 +08:00
2026-08-28 15:54:47 +08:00
2026-10-16 17:33:24 +08:00
2026-09-17 21:00:10 +08:00
2026-08-28 10:33:05 +08:00
2026-10-22 15:09:31 +08:00
2026-08-25 14:58:46 +08:00
2026-09-18 16:01:40 +08:00
2026-09-18 10:17:39 +08:00
2026-09-17 20:58:21 +08:00
2026-09-17 20:54:02 +08:00
2026-09-28 11:06:38 +08:00
2026-10-15 15:28:46 +08:00
2026-10-18 01:39:36 +08:00
2026-10-18 14:51:12 +08:00
2026-10-22 13:14:03 +08:00
2026-10-22 12:46:13 +08:00
2026-10-22 12:46:13 +08:00
2026-08-13 10:03:21 +08:00
2026-08-13 10:03:21 +08:00
2026-08-06 17:52:33 +08:00
2026-10-22 15:03:26 +08:00
2026-09-22 19:03:03 +08:00
2026-09-14 11:38:24 +08:00
2026-10-22 12:53:03 +08:00
2026-10-15 15:28:46 +08:00
2026-09-24 19:51:24 +08:00
2026-08-18 11:20:46 +08:00
2026-10-18 12:42:15 +08:00
2026-10-18 12:42:15 +08:00
2026-08-18 11:20:46 +08:00
2026-10-22 15:03:26 +08:00
2026-10-22 15:03:26 +08:00
2026-10-16 11:47:28 +08:00
2026-10-22 12:53:03 +08:00
2026-10-22 11:52:27 +08:00
2026-09-14 15:33:45 +08:00
2026-09-14 10:16:48 +08:00
2026-10-22 11:52:27 +08:00
2026-10-22 15:03:26 +08:00
2026-09-07 20:27:19 +08:00
2026-09-09 09:14:18 +08:00
2026-09-07 20:02:43 +08:00
2026-10-18 00:43:31 +08:00
2026-09-09 09:27:06 +08:00
2026-09-07 20:10:12 +08:00
2026-09-07 20:15:36 +08:00
2026-09-09 09:22:00 +08:00
2026-08-13 10:03:21 +08:00
2026-09-07 20:32:58 +08:00
2026-09-07 20:37:28 +08:00
2026-10-15 15:28:46 +08:00
2026-09-09 09:42:13 +08:00
2026-09-09 09:04:29 +08:00
2026-09-09 09:42:13 +08:00
2026-09-07 20:10:12 +08:00
2026-09-07 20:02:43 +08:00
2026-09-07 20:15:36 +08:00
2026-09-09 09:42:13 +08:00
2026-08-11 09:45:08 +08:00
2026-09-14 11:38:24 +08:00
2026-09-07 20:27:19 +08:00
2026-09-09 09:22:00 +08:00
2026-09-09 09:14:18 +08:00
2026-10-15 15:45:52 +08:00
2026-09-14 11:33:11 +08:00
2026-10-22 15:03:26 +08:00
2026-09-01 09:59:03 +08:00
2026-09-01 10:06:56 +08:00
2026-09-18 09:02:53 +08:00
2026-10-15 14:13:42 +08:00
2026-10-15 13:12:53 +08:00
2026-10-15 20:36:12 +08:00
2026-10-15 13:12:53 +08:00
2026-10-15 13:12:53 +08:00
2026-09-14 13:39:12 +08:00
2026-10-15 20:36:12 +08:00
2026-10-15 14:13:42 +08:00
2026-10-15 14:13:42 +08:00
2026-08-07 09:41:53 +08:00
2026-08-07 09:41:53 +08:00
2026-10-22 15:03:26 +08:00
2026-08-29 10:35:13 +08:00
2026-09-04 13:43:35 +08:00
2026-09-28 11:36:45 +08:00