feat(parse): bold infix expressions are ExprStmt, not calls

`` **n + 1** `` evaluates and discards (design §6.2); keep assign-first and
bare-call fallback. Explicit `` **> …** `` uses standalone bare=text rules.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
cflmyandCursor committed 2026-09-14 15:12:00 +08:00
1 parent 114fd53cd1
commit bccfec86ba
9 files changed
+81 -8

No files matched your search

+8
View File
@@ -86,6 +86,11 @@ pub enum Stmt {
call: CallExpr,
span: Span,
},
/// Bold expression statement (`**n + 1**`); value evaluated and discarded.
Expr {
value: Expr,
span: Span,
},
Branch {
arms: Vec<BranchArm>,
span: Span,
@@ -309,6 +314,9 @@ fn dump_stmt(out: &mut String, stmt: &Stmt, depth: usize) {
call.receiver, call.callee, call.args
));
}
Stmt::Expr { value, span } => {
out.push_str(&format!("{pad}(expr {value:?} @{span})\n"));
}
Stmt::Branch { arms, span } => {
out.push_str(&format!("{pad}(branch @{span}\n"));
for arm in arms {
+5
View File
@@ -335,6 +335,11 @@ impl<'a> FnCompiler<'a> {
self.stmt_span = *span;
self.compile_call(call, true)?;
}
Stmt::Expr { value, span } => {
self.stmt_span = *span;
self.compile_expr(value)?;
self.emit(Op::Pop);
}
Stmt::Branch { arms, span } => {
self.stmt_span = *span;
let mut end_jumps = Vec::new();
+14
View File
@@ -367,6 +367,19 @@ impl Interpreter {
let _ = self.eval_call(module, fun, env, call)?;
Ok(None)
}
Stmt::Expr { value, span } => {
self.current_span = *span;
if self.trace {
emit_trace(
self.path.as_deref(),
Some(*span),
"stmt",
&[("kind", "expr")],
);
}
let _ = self.eval_expr(module, fun, env, value)?;
Ok(None)
}
Stmt::Branch { arms, span } => {
self.current_span = *span;
if self.trace {
@@ -1248,6 +1261,7 @@ fn stmt_span(stmt: &Stmt) -> Span {
Stmt::Assign { span, .. }
| Stmt::Return { span, .. }
| Stmt::Call { span, .. }
| Stmt::Expr { span, .. }
| Stmt::Branch { span, .. }
| Stmt::While { span, .. }
| Stmt::ForEach { span, .. } => *span,
+25 -4
View File
@@ -427,7 +427,7 @@ impl<'a> Cursor<'a> {
Err(Diagnostic::new(None, span, format!("unrecognized statement: {trimmed}")).into())
}
/// Parse bold-code inner into Assign / Call.
/// Parse bold-code inner into Assign / Call / Expr (design §6.2).
fn stmt_from_bold_inner(&mut self, inner: &str, span: Span) -> Result<Stmt> {
let inner = inner.trim();
if inner.is_empty() {
@@ -448,7 +448,20 @@ impl<'a> Cursor<'a> {
end_line,
});
}
// Call without `>`: `print text="hi"` / `加一函数 37`
if let Some(rest) = inner.strip_prefix('>') {
// Explicit `>` keeps standalone call rules (bare words = text).
let call = parse_call_after_gt(rest.trim(), false)
.map_err(|e| anyhow::anyhow!("{span}: bold code: {e}"))?;
return Ok(Stmt::Call { call, span });
}
// Expression first (`n + 1` / `[k](c)`); bare call second (`加一 37`).
if let Ok(e) = parse_expr_prefer_var(inner) {
match e {
Expr::Call(call) => return Ok(Stmt::Call { call, span }),
Expr::Var(_) | Expr::Literal(_) => {}
value => return Ok(Stmt::Expr { value, span }),
}
}
let multi = inner.split_whitespace().count() >= 2 || inner.contains('=');
if multi {
let call = parse_call_tail(inner, true)
@@ -456,8 +469,7 @@ impl<'a> Cursor<'a> {
.map_err(|e| anyhow::anyhow!("{span}: bold code: {e}"))?;
return Ok(Stmt::Call { call, span });
}
// Single token: treat as expression discarded via assign to `_`? Prefer error.
bail!("{span}: bold code must be assignment or call (got `{inner}`)");
bail!("{span}: bold code must be assignment, call, or expression (got `{inner}`)");
}
#[allow(dead_code)]
@@ -1343,6 +1355,15 @@ fn collect_names_needing_input(
}
}
}
Stmt::Expr { value, .. } => {
let mut reads = std::collections::HashSet::new();
collect_reads_expr(value, &mut reads);
for r in reads {
if !bound.contains(&r) {
needs.insert(r);
}
}
}
Stmt::Branch { arms, .. } => {
for a in arms {
if let Some(c) = &a.condition {
+9 -2
View File
@@ -89,7 +89,7 @@ fn collect_input_prompts_fun(fun: &Function, out: &mut Vec<String>) {
fn collect_input_prompts_stmt(stmt: &Stmt, out: &mut Vec<String>) {
match stmt {
Stmt::Assign { value, .. } | Stmt::Return { value, .. } => {
Stmt::Assign { value, .. } | Stmt::Return { value, .. } | Stmt::Expr { value, .. } => {
collect_input_prompts_expr(value, out);
}
Stmt::Call { call, .. } => {
@@ -1010,6 +1010,7 @@ fn stmt_start(stmt: &Stmt) -> u32 {
Stmt::Assign { span, .. }
| Stmt::Return { span, .. }
| Stmt::Call { span, .. }
| Stmt::Expr { span, .. }
| Stmt::Branch { span, .. }
| Stmt::While { span, .. }
| Stmt::ForEach { span, .. } => span.line,
@@ -1019,7 +1020,9 @@ fn stmt_start(stmt: &Stmt) -> u32 {
fn stmt_end_line(stmt: &Stmt) -> u32 {
match stmt {
Stmt::Assign { end_line, .. } => end_line + 1,
Stmt::Return { span, .. } | Stmt::Call { span, .. } => span.line + 1,
Stmt::Return { span, .. } | Stmt::Call { span, .. } | Stmt::Expr { span, .. } => {
span.line + 1
}
Stmt::Branch { arms, span, .. } => {
let mut end = span.line + 1;
for arm in arms {
@@ -1185,6 +1188,10 @@ fn render_stmt(
"<div class=\"card call-card\"><span class=\"badge\">call</span><code class=\"expr\">{}</code></div>",
escape(&call_display(call))
),
Stmt::Expr { value, .. } => format!(
"<div class=\"card\"><span class=\"badge\">expr</span><code class=\"expr\">{}</code></div>",
escape(&expr_display(value))
),
Stmt::Branch { arms, .. } => {
let mut body =
String::from("<div class=\"card branch-card\"><span class=\"badge\">branch</span>");