原计划的"翻转默认 + 旧形硬报错"不可行:`[键](集合)` 与 `[描述](实现)` 外形相同, 翻转会让 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
4.4 KiB
markup: occlusion title: spa client description: routes table + memory store; list / detail / edit import browser:lib/browser.mq.md import table:lib/table.mq.md import text:lib/text.mq.md
main
Routes (documentation + titles). Runtime switches panels by path.
routes =
| @ | 路径 | 面板 | 标题 |
|---|---|---|---|
| 1 | / | #view-list | Items |
| 2 | /item | #view-detail | Detail |
| 3 | /edit | #view-edit | Edit |
path = "/"
cur_id = ""
items = "Alpha\nBeta"
wire =
| @ | 选择器 | 事件 | 调用 | 委托 | 值选择器 |
|---|---|---|---|---|---|
| 1 | "#nav-list" | click | go_list | ||
| 2 | "#nav-new" | click | go_new | ||
| 3 | "#items" | click | open_item | "li[data-id]" | |
| 4 | "#btn-edit" | click | go_edit | ||
| 5 | "#btn-back" | click | go_list | ||
| 6 | "#btn-save" | click | save_item | "#edit-title" | |
| 7 | "#btn-cancel" | click | go_list | ||
| 8 | "window" | popstate | on_pop |
seed =
| op | key | value | scope |
|---|---|---|---|
| set | spa-items | items |
memory |
w = > table.put in=None at="wire" value=wire
s = > browser.storage spec=seed
boot = > browser.merge a=w b=s
ready = > browser.set_text sel="#log" text="spa ready — click Items"
> browser.merge a=boot b=ready
on_pop
+ `path`=""
path!= ""path= path-
> spa_render
go_list
path = "/"
cur_id = ""
> spa_render
go_new
path = "/edit"
cur_id = ""
> spa_render
go_edit
path = "/edit"
> spa_render
open_item
+ `data_id`=""
data_id!= ""cur_id= data_idpath= "/item" > spa_render-
save_item
+ `value`=""
value!= ""cur_id!= ""parts= > text.str_split s=items sep="\n"next= ""- [item](遍历 parts 为 item)
item!= ""item==cur_idnext== ""next= value-
next= next + "\n" + value
-
next== ""next= item-
next= next + "\n" + itemitems= nextcur_id= value
- [item](遍历 parts 为 item)
-
items== ""items= value-
items= items + "\n" + valuecur_id= valuepath= "/item" > spa_render
-
spa_render
> spa_paint
spa_paint
hide = > table.put in=None at="hidden" value=""
show = > table.put in=None at="hidden" value=False
path== "/item"attrs=#view-detail #view-list #view-edit showhidehidetitle= "Detail"body= cur_id-
path== "/edit"attrs=#view-edit #view-list #view-detail showhidehidetitle= "Edit"body= cur_id-
attrs=#view-list #view-detail #view-edit showhidehidetitle= "Items"body= ""parts= > text.str_split s=items sep="\n"html= ""
- [item](遍历 parts 为 item)
item!= ""html= html + "<li data-id="" + item + "">" + item + " "
persist=
| op | key | value | scope |
|---|---|---|---|
| set | spa-items | items |
memory |
t = > browser.set_text sel="#title" text=title
a = > browser.wrap key="set_attr" value=attrs
ret = > browser.merge a=t b=a
list = > browser.set_html sel="#items" html=html
ret = > browser.merge a=ret b=list
d = > browser.set_text sel="#detail-body" text=body
ret = > browser.merge a=ret b=d
path== "/edit"v= > browser.set_value sel="#edit-title" value=cur_idret= > browser.merge a=ret b=v-
nav = > browser.spa_goto url=path
ret = > browser.merge a=ret b=nav
log = > browser.set_text sel="#log" text=path
ret = > browser.merge a=ret b=log
sav = > browser.storage spec=persist
> browser.merge a=ret b=sav