forked from leanprover/lean4
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: WF.Fix: deduplicate subsumed goals before running tactic (leanpr…
…over#3024) before code like def dup (a : Nat) (b : Nat := a) := a + b def rec : Nat → Nat | 0 => 1 | n+1 => dup (dup (dup (rec n))) decreasing_by decreasing_tactic would run the `decreasing_tactic` 8 tims, because the recursive call `rec n` gets duplicate due to the default paramter. Similar effects can be observed due to dependent types or tactics like `cases`. This is wasteful, and is confusing to the user when they use `decreasing_by` interactively. Therfore, we now go through the proof obligations (MVars) and if solving one would imply solving another one, we assign the mvars to each other accordingly. This PR is a sibling of leanprover#3004.
- Loading branch information
Showing
3 changed files
with
68 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/- | ||
Copyright (c) 2023 Lean FRO, LLC. All rights reserved. | ||
Released under Apache 2.0 license as described in the file LICENSE. | ||
Authors: Joachim Breitner | ||
-/ | ||
|
||
import Init.Data.Array | ||
|
||
namespace Array | ||
|
||
/-! | ||
This module contains utility functions involving Arrays that are useful in a few places | ||
of the lean code base, but too specialized to live in `Init.Data.Array`, which arguably | ||
is part of the public, user-facing standard library. | ||
-/ | ||
|
||
/-- | ||
Given an array `a`, runs `f xᵢ xⱼ` for all `i < j`, removes those entries for which `f` returns | ||
`false` (and will subsequently skip pairs if one element is removed), and returns the array of | ||
remaining elements. | ||
This can be used to remove elements from an array where a “better” element, in some partial | ||
order, exists in the array. | ||
-/ | ||
def filterPairsM {m} [Monad m] {α} (a : Array α) (f : α → α → m (Bool × Bool)) : | ||
m (Array α) := do | ||
let mut removed := Array.mkArray a.size false | ||
let mut numRemoved := 0 | ||
for h1 : i in [:a.size] do for h2 : j in [i+1:a.size] do | ||
unless removed[i]! || removed[j]! do | ||
let xi := a[i]'h1.2 | ||
let xj := a[j]'h2.2 | ||
let (keepi, keepj) ← f xi xj | ||
unless keepi do | ||
numRemoved := numRemoved + 1 | ||
removed := removed.set! i true | ||
unless keepj do | ||
numRemoved := numRemoved + 1 | ||
removed := removed.set! j true | ||
let mut a' := Array.mkEmpty numRemoved | ||
for h : i in [:a.size] do | ||
unless removed[i]! do | ||
a' := a'.push (a[i]'h.2) | ||
return a' | ||
|
||
end Array |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters