Skip to content

[Merged by Bors] - feat: have ring_nf fail if no progress #24529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
plp127 wants to merge 6 commits into from
Closed

[Merged by Bors] - feat: have ring_nf fail if no progress #24529

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de8b8ca
add
plp127 May 1, 2025
2d3cd35
fix `group`
plp127 May 1, 2025
25afd2c
fix padics
plp127 May 1, 2025
756cb7d
fix tests
plp127 May 1, 2025
1871e1c
only apply `ring_nf` to the goal which changed
plp127 May 12, 2025
30762f3
explain why not `fail_if_success`
plp127 May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Mathlib/NumberTheory/Padics/PadicNumbers.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ theorem exi_rat_seq_conv_cauchy : IsCauSeq (padicNorm p) (limSeq f) := fun ε h
intro j hj
suffices
padicNormE (limSeq f j - f (max N N2) + (f (max N N2) - limSeq f (max N N2)) : ℚ_[p]) < ε by
ring_nf at this ⊢
ring_nf -failIfUnchanged at this ⊢
Comment thread
plp127 marked this conversation as resolved.
Outdated
rw [← padicNormE.eq_padic_norm']
exact mod_cast this
apply lt_of_le_of_lt
Expand Down
2 changes: 1 addition & 1 deletion Mathlib/Tactic/Group.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ syntax (name := aux_group₂) "aux_group₂" (location)? : tactic

macro_rules
| `(tactic| aux_group₂ $[at $location]?) =>
`(tactic| ring_nf $[at $location]?)
`(tactic| ring_nf -failIfUnchanged $[at $location]?)

/-- Tactic for normalizing expressions in multiplicative groups, without assuming
commutativity, using only the group axioms without any information about which group
Expand Down
12 changes: 10 additions & 2 deletions Mathlib/Tactic/Ring/RingNF.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ structure Config where
zetaDelta := false
/-- if true, atoms inside ring expressions will be reduced recursively -/
recursive := true
/-- if true, then fail if no progess is made -/
failIfUnchanged := true
/-- The normalization style. -/
mode := RingMode.SOP
deriving Inhabited, BEq, Repr
Expand Down Expand Up @@ -177,7 +179,10 @@ def ringNFTarget (s : IO.Ref AtomM.State) (cfg : Config) : TacticM Unit := withM
goal.assign (← mkOfEqTrue (← r.getProof))
replaceMainGoal []
else
replaceMainGoal [← applySimpResultToTarget goal tgt r]
let newGoal ← applySimpResultToTarget goal tgt r
if cfg.failIfUnchanged && goal == newGoal then
throwError "ring_nf made no progress"
replaceMainGoal [newGoal]

/-- Use `ring_nf` to rewrite hypothesis `h`. -/
def ringNFLocalDecl (s : IO.Ref AtomM.State) (cfg : Config) (fvarId : FVarId) :
Expand All @@ -187,7 +192,10 @@ def ringNFLocalDecl (s : IO.Ref AtomM.State) (cfg : Config) (fvarId : FVarId) :
let myres ← M.run s cfg <| rewrite tgt
match ← applySimpResultToLocalDecl goal fvarId myres false with
| none => replaceMainGoal []
| some (_, newGoal) => replaceMainGoal [newGoal]
| some (_, newGoal) =>
if cfg.failIfUnchanged && goal == newGoal then
throwError "ring_nf made no progress"
replaceMainGoal [newGoal]

/--
Simplification tactic for expressions in the language of commutative (semi)rings,
Expand Down
8 changes: 4 additions & 4 deletions MathlibTest/ring.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,16 +211,16 @@ set_option linter.unusedTactic false in
example (x : ℝ) (f : ℝ → ℝ) : True := by
let y := x
have : x = y := by
ring_nf
ring_nf -failIfUnchanged
Comment thread
plp127 marked this conversation as resolved.
ring_nf!
have : x - y = 0 := by
ring_nf
ring_nf -failIfUnchanged
ring_nf!
have : f x = f y := by
ring_nf
ring_nf -failIfUnchanged
ring_nf!
have : f x - f y = 0 := by
ring_nf
ring_nf -failIfUnchanged
ring_nf!
trivial

Expand Down