feat(lang): M3 access 内建与遮蔽循环 — 为 M7 迁移准备等价语义

access(集合, 键)(别名 取/取值):
- 复用 builtin_footnote_get,与旧 [键](集合) 语义完全一致
  (Map 按键 / List 1-based 下标 / 缺键报 missing map key,不静默 None)
- 不新增平行实现,避免两套索引语义漂移
- 用途:M7 把 506 处 [k](c) 机械改写成 access(c, k),语义零漂移

遮蔽循环:- [描述](遍历 集合 为 变量)
- 仅 occlusion 模式识别;接受 遍历/for 与 为/as/in
- 描述存入 Stmt::ForEach.label(Option<String>),供 M8 渲染/诊断

为什么先 M3 后 M7:迁移目标必须先存在且等价,否则就是"边迁移边发明语义"。

实测:
  access(`表`,"键") → 值;access(`列`,2) → 二;
  缺键 → missing map key(与旧取元同一错误)
  - [篮子里的每个果子](遍历 `列` 为 `果`) → 果=一 / 果=二

测试:2 个集成(含缺键错误保真);全量 595 passed / 0 failed(M5 后 593 + 2)

文档:doc/design/change-m3-access-and-loop.md
This commit is contained in:
cflmy committed 2026-10-22 15:23:36 +08:00
1 parent 409b8df2cb
commit 0405a60d68
7 files changed
+205

No files matched your search

+43
View File
@@ -961,6 +961,20 @@ impl<'a> Cursor<'a> {
let trimmed = line.text.trim();
let rest = trimmed.strip_prefix('-').unwrap().trim();
// `<TAB>` M3: occlusion loop `- [描述](遍历 集合 为 变量)`
if crate::parse::expr::markup_default() == crate::parse::expr::Markup::Occlusion {
if let Some((label, coll, item)) = parse_occluded_foreach(rest) {
let body = self.parse_indented_body(base_indent)?;
return Ok(Stmt::ForEach {
item,
collection: coll,
label: Some(label),
body,
span,
});
}
}
// foreach: [item](collection) or narrative sugar
if let Some((item, coll)) = parse_foreach_header(rest)
.or_else(|| parse_foreach_narrative(rest))
@@ -969,6 +983,7 @@ impl<'a> Cursor<'a> {
return Ok(Stmt::ForEach {
item,
collection: coll,
label: None,
body,
span,
});
@@ -1263,6 +1278,34 @@ fn parse_foreach_ident(s: &str) -> Option<String> {
Some(s.to_string())
}
/// `<TAB>` M3: `[描述](遍历 集合 为 变量)` → `(label, collection, item)`.
fn parse_occluded_foreach(rest: &str) -> Option<(String, String, String)> {
let rest = rest.trim();
if !rest.starts_with('[') {
return None;
}
let end = rest.find(']')?;
let label = rest[1..end].trim().to_string();
let after = rest[end + 1..].trim_start();
if !after.starts_with('(') || !after.ends_with(')') {
return None;
}
let inner = after[1..after.len() - 1].trim();
let parts: Vec<&str> = inner.split_whitespace().collect();
// `遍历 <collection> 为 <item>` (English `for <c> as <i>` accepted too)
if parts.len() != 4 {
return None;
}
let head_ok = matches!(parts[0], "遍历" | "for");
let mid_ok = matches!(parts[2], "为" | "as" | "in");
if !head_ok || !mid_ok {
return None;
}
let coll = parse_foreach_ident(parts[1])?;
let item = parse_foreach_ident(parts[3])?;
Some((label, coll, item))
}
fn parse_foreach_header(rest: &str) -> Option<(String, String)> {
// [`item`](`collection`) or bare [item](collection); sides may mix.
let rest = rest.trim();