06fb4bec52
This PR wraps the top-level command parser with `withPosition` to enforce indentation in `by` blocks, combined with an empty-by fallback for better error messages. This subsumes #3215 (which introduced `withPosition commandParser` but without the empty-by fallback). It is also related to #9524, which explores elaboration with empty tactic sequences — this PR reuses that idea for the empty-by fallback, so that a `by` not followed by an indented tactic produces an elaboration error (unsolved goals) rather than a parse error. **Changes:** - `topLevelCommandParserFn` now uses `(withPosition commandParser).fn`, setting the saved position at the start of each top-level command - `tacticSeqIndentGt` gains an empty tactic sequence fallback (`pushNone`) so that missing indentation produces an elaboration error (unsolved goals) instead of a parse error - `isEmptyBy` in `goalsAt?` removed: with strict `by` indentation, empty `by` blocks parse successfully via `pushNone` (producing empty nodes) rather than producing `.missing` syntax, making the `isEmptyBy` check dead code. The `isEmpty` helper in `isSyntheticTacticCompletion` continues to work correctly because it handles both `.missing` and empty nodes from `pushNone` (via the vacuously-true `args.all isEmpty` on `#[]`) - Test files updated to indent `by` blocks and expression continuations that were previously at column 0 **Behavior:** - Top-level `by` blocks now require indentation (column > 0 for commands at column 0) - Commands indented inside `section` require proofs to be indented past the command's column - `#guard_msgs in example : True := by` works because tactic indentation is checked against the outermost command's column - Expression continuations (not just `by`) must also be indented past the command, which is slightly more strict but more consistent - `have : True := by` followed by a dedent now correctly puts `this` in scope in the outer tactic block (the `have` is structurally complete with an unsolved-goal error, rather than a parse error) **Code changes observed in practice (lean4 test suite + Mathlib):** - `by` blocks: top-level `theorem ... := by` / `decreasing_by` followed by tactics at column 0 must be indented - `variable` continuations: `variable {A : Type*} [Foo A]\n{B : Type*}` where the second line starts at column 0 must be indented (most common category in Mathlib) - Expression continuations: `def f : T :=\nexpr` or `#synth Foo\n[args]` where the body/arguments start at column 0 - Structure literals: `.symm\n{ toFun := ...` where the struct literal starts at column 0 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
52 lines
1.8 KiB
Text
52 lines
1.8 KiB
Text
byStrictIndent.lean:3:55-3:57: error: unsolved goals
|
|
n : Nat
|
|
h : n > 1
|
|
⊢ n > 1
|
|
byStrictIndent.lean:4:0-4:5: error: unexpected identifier; expected command
|
|
byStrictIndent.lean:8:25-8:27: error: unsolved goals
|
|
n : Nat
|
|
h : n > 0
|
|
⊢ n > 1
|
|
byStrictIndent.lean:10:2-10:7: error: No goals to be solved
|
|
byStrictIndent.lean:13:54-15:9: error: unsolved goals
|
|
n : Nat
|
|
h : n > 0
|
|
helper : n > 1
|
|
⊢ n > 1
|
|
byStrictIndent.lean:16:3-16:8: error: unexpected token 'sorry'; expected command
|
|
byStrictIndent.lean:19:54-21:9: error: unsolved goals
|
|
n : Nat
|
|
h : n > 0
|
|
helper : n > 1
|
|
⊢ n > 1
|
|
byStrictIndent.lean:22:6-22:11: error: unexpected token 'sorry'; expected command
|
|
byStrictIndent.lean:38:50-38:52: error: unsolved goals
|
|
⊢ True
|
|
byStrictIndent.lean:38:32-38:52: error: unsolved goals
|
|
this : True
|
|
⊢ True
|
|
byStrictIndent.lean:39:2-39:7: error: unexpected identifier; expected command
|
|
byStrictIndent.lean:43:68-43:70: error: unsolved goals
|
|
⊢ True
|
|
byStrictIndent.lean:43:50-43:70: error: unsolved goals
|
|
this : True
|
|
⊢ True
|
|
byStrictIndent.lean:43:32-43:70: error: unsolved goals
|
|
this : True
|
|
⊢ True
|
|
byStrictIndent.lean:44:2-44:7: error: unexpected identifier; expected command
|
|
byStrictIndent.lean:68:18-68:20: error: unsolved goals
|
|
⊢ True
|
|
byStrictIndent.lean:69:0-69:7: error: unexpected identifier; expected command
|
|
byStrictIndent.lean:72:45-72:47: error: unsolved goals
|
|
⊢ True
|
|
byStrictIndent.lean:73:0-73:7: error: unexpected identifier; expected command
|
|
byStrictIndent.lean:85:32-85:34: error: unsolved goals
|
|
⊢ True
|
|
byStrictIndent.lean:86:2-86:9: error: unexpected identifier; expected command
|
|
byStrictIndent.lean:92:38-92:40: error: unsolved goals
|
|
⊢ True
|
|
byStrictIndent.lean:93:2-93:5: error: unexpected token; expected command
|
|
byStrictIndent.lean:97:48-98:6: error: unsolved goals
|
|
⊢ True
|
|
byStrictIndent.lean:99:2-99:5: error: unexpected token; expected command
|