From 114fd53cd1f11fa22ef4230cdfac99e04ccb1c5b Mon Sep 17 00:00:00 2001 From: cflmy Date: Mon, 14 Sep 2026 14:50:01 +0800 Subject: [PATCH] fix(prose): Decl names are identifiers; skip non-decl tick spans MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reject `` `n+1` `` as Decl, and when skipping non-decl `` `…` `` advance past the closing tick so inner `*` cannot open italic (fixes `` `OPENAI_*` `` in ext/ai/llm). Co-authored-by: Cursor --- doc/design/markdown-mapping-v0.3.md | 2 +- src/lex/mod.rs | 13 +++++++++- src/parse/prose.rs | 35 +++++++++++++++++++++++++- tests/gold.rs | 5 ++++ tests/markup-v03/decl-ident-only.mq.md | 15 +++++++++++ 5 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 tests/markup-v03/decl-ident-only.mq.md diff --git a/doc/design/markdown-mapping-v0.3.md b/doc/design/markdown-mapping-v0.3.md index 2de8e67..4d58796 100644 --- a/doc/design/markdown-mapping-v0.3.md +++ b/doc/design/markdown-mapping-v0.3.md @@ -567,7 +567,7 @@ FnDef.params: | 1 | 空返回词法 | **已决议** | §7.2:推荐 `*None*`/`*无*`;整行 `**`;兼容 `****`;`---` 仅叙述跳过 | | 2 | 提及性反引号 | **已决议** | §4.4:一律视作变量;未使用不报错、不升参;不设提及前缀 | | 3 | 粗体内调用 vs 赋值 | 建议 | 以 `=` 左值合法性优先 | -| 4 | `` `n`+1 `` 误声明 | 建议 | 仅完整单个 code span `` `ident` `` 触发声明 | +| 4 | `` `n`+1 `` 误声明 | **已落地** | Decl 名须为标识符;`` `n+1` `` 不升 Decl | | 5 | 叙述强调斜体 vs 返回 | 建议 | 函数体内合法返回表达式才当返回;否则当文字 | | 6 | 一行多 `**…**` | **建议采纳** | 允许,按出现序执行(M0 钉死为是) | | 7 | view 展示 prose Decl | **已落地** | Structure / Functions 大纲:`inferred` 形参标注(`chip inferred`) | diff --git a/src/lex/mod.rs b/src/lex/mod.rs index 0b5d37e..aadf43d 100644 --- a/src/lex/mod.rs +++ b/src/lex/mod.rs @@ -90,7 +90,7 @@ fn looks_like_backtick_assign(trimmed: &str) -> bool { return false; }; let name = &rest[..end]; - if name.is_empty() || name.chars().any(|c| c.is_whitespace()) { + if name.is_empty() || !is_backtick_bind_name(name) { return false; } let after_tick = &rest[end + 1..]; @@ -115,6 +115,17 @@ fn looks_like_backtick_assign(trimmed: &str) -> bool { true } +fn is_backtick_bind_name(name: &str) -> bool { + let mut chars = name.chars(); + let Some(first) = chars.next() else { + return false; + }; + if !(first.is_alphabetic() || first == '_' || !first.is_ascii()) { + return false; + } + chars.all(|c| c.is_alphanumeric() || c == '_' || !c.is_ascii()) +} + /// `*` / `**` lines that are Marqdo executable (statement / return / else), not narrative Markdown. /// /// Closing `*` / `**` must not be taken from inside `` `…` `` or `"…"` (GAP-06/07 nested markers). diff --git a/src/parse/prose.rs b/src/parse/prose.rs index 586d2f8..a1e4cc0 100644 --- a/src/parse/prose.rs +++ b/src/parse/prose.rs @@ -35,6 +35,12 @@ pub fn scan_prose_line(line: &str) -> Vec { i = next; continue; } + // Non-decl span (e.g. `` `OPENAI_*` ``): skip whole ticks so inner `*` + // does not open italic/bold. + if let Some(rel) = line[i + 1..].find('`') { + i = i + 1 + rel + 1; + continue; + } i += 1; continue; } @@ -121,7 +127,7 @@ fn scan_backtick_decl(line: &str, start: usize) -> Option<(ProseBit, usize)> { let rest = &line[start + 1..]; let end = rest.find('`')?; let name = rest[..end].to_string(); - if name.is_empty() || name.chars().any(|c| c.is_whitespace()) { + if name.is_empty() || !is_prose_decl_name(&name) { return None; } let after_tick = start + 1 + end + 1; @@ -154,6 +160,18 @@ fn scan_backtick_decl(line: &str, start: usize) -> Option<(ProseBit, usize)> { )) } +/// Identifiers only: letters / digits / `_` / non-ASCII (CJK). Rejects `` `n+1` ``. +fn is_prose_decl_name(name: &str) -> bool { + let mut chars = name.chars(); + let Some(first) = chars.next() else { + return false; + }; + if !(first.is_alphabetic() || first == '_' || !first.is_ascii()) { + return false; + } + chars.all(|c| c.is_alphanumeric() || c == '_' || !c.is_ascii()) +} + #[cfg(test)] mod tests { use super::*; @@ -213,4 +231,19 @@ mod tests { "{bits:?}" ); } + + #[test] + fn reject_n_plus_one_as_decl() { + let bits = scan_prose_line("输入`n+1`然后继续。"); + assert!(bits.is_empty(), "`` `n+1` `` must not Decl: {bits:?}"); + } + + #[test] + fn skip_glob_backticks_without_italic() { + let bits = scan_prose_line("from `OPENAI_*` / `MARQDO_LLM_*`."); + assert!( + bits.is_empty(), + "glob-like ticks must not yield italic: {bits:?}" + ); + } } diff --git a/tests/gold.rs b/tests/gold.rs index c46e834..5ca1c32 100644 --- a/tests/gold.rs +++ b/tests/gold.rs @@ -3878,3 +3878,8 @@ fn markup_v03_dynamic_footnote() { fn markup_v03_leading_backtick_decl() { assert_out_v03("tests/markup-v03/leading-backtick-decl.mq.md", "ok"); } + +#[test] +fn markup_v03_decl_ident_only() { + assert_out_v03("tests/markup-v03/decl-ident-only.mq.md", "42"); +} diff --git a/tests/markup-v03/decl-ident-only.mq.md b/tests/markup-v03/decl-ident-only.mq.md new file mode 100644 index 0000000..8b2c3ea --- /dev/null +++ b/tests/markup-v03/decl-ident-only.mq.md @@ -0,0 +1,15 @@ +--- +title: `` `n+1` `` is not a Decl name +description: Only identifier Decl names elevate; `` `n+1` `` stays narrative +--- + +## 加一 + +输入变量`n`。**n=n+1**返回*n*。 + +旁注里的`n+1`不是形参名。 + +# main + +**r = 加一 41** +**print text=r**