Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a115150
downstream: follow upstream PR
downstream-lean4[bot] Aug 19, 2026
7572f5b
reimplement filterDiscrTreeM in terms of upstream mapArraysM
robsimmons Aug 19, 2026
34bb0ce
downstream: follow upstream PR
downstream-lean4[bot] Aug 19, 2026
3cd2bfb
Add inline annotations, remove inhabited constraint
robsimmons Aug 19, 2026
a81f4b8
downstream: follow upstream PR
downstream-lean4[bot] Aug 19, 2026
d5075a2
downstream: follow upstream PR
downstream-lean4[bot] Aug 19, 2026
f338d48
Merge remote-tracking branch 'origin/green' into adaptation-14844
robsimmons Aug 20, 2026
0820e8a
downstream: follow upstream PR
downstream-lean4[bot] Aug 17, 2026
7e67b5e
downstream: follow upstream PR
downstream-lean4[bot] Aug 18, 2026
b6f758d
adapt batteries
robsimmons Aug 19, 2026
6a75e5f
implement DiscrTree.elements in terms of DiscrTree.values
robsimmons Aug 19, 2026
5be68b6
downstream: follow upstream PR
downstream-lean4[bot] Aug 19, 2026
8e18876
downstream: follow upstream PR
downstream-lean4[bot] Aug 19, 2026
8b54c77
downstream: follow upstream PR
downstream-lean4[bot] Aug 19, 2026
4764067
use asNode/mkNode to avoid previewing trie implementation details
robsimmons Aug 19, 2026
09ed207
downstream: follow upstream PR
downstream-lean4[bot] Aug 20, 2026
5a9e561
downstream: follow upstream PR
downstream-lean4[bot] Aug 21, 2026
d43df78
change node to chain in DiscrTree test output
robsimmons Aug 21, 2026
a83dd14
Merge branch 'master' into adaptation-14805
robsimmons Aug 28, 2026
0842684
downstream: follow upstream PR
downstream-lean4[bot] Aug 28, 2026
3050bdf
Remove double import
robsimmons Aug 28, 2026
33f1924
downstream: follow upstream PR
downstream-lean4[bot] Aug 28, 2026
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
7 changes: 4 additions & 3 deletions batteries/Batteries/Lean/Meta/DiscrTree.lean
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@ namespace Trie
/--
Merge two `Trie`s. Duplicate values are preserved.
-/
partial def mergePreservingDuplicates : Trie α → Trie α → Trie α
| node vs₁ cs₁, node vs₂ cs₂ =>
node (vs₁ ++ vs₂) (mergeChildren cs₁ cs₂)
partial def mergePreservingDuplicates (t₁ t₂ : Trie α) : Trie α :=
match (t₁.asNode, t₂.asNode) with
| ((vs₁, cs₁), (vs₂, cs₂)) =>
Trie.mkNode (vs₁ ++ vs₂) (mergeChildren cs₁ cs₂)
where
/-- Auxiliary definition for `mergePreservingDuplicates`. -/
mergeChildren (cs₁ cs₂ : Array (Key × Trie α)) :
Expand Down
2 changes: 1 addition & 1 deletion lean-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
leanprover/lean4:nightly-2026-08-27
leanprover/lean4-pr-releases:pr-release-14805-0ad131b
8 changes: 4 additions & 4 deletions mathlib4/MathlibTest/Tactic/Push/Basic.lean
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ info: DiscrTree branch for Or:
(node
(* => (node
(False => (node #[or_false:1000]))
(And => (node (* => (node (* => (node #[or_and_left:1000]))))))
(And => (chain * => (chain * => (node #[or_and_left:1000]))))
(True => (node #[or_true:1000]))))
(False => (node (* => (node #[false_or:1000]))))
(And => (node (* => (node (* => (node (* => (node #[and_or_right:1000]))))))))
(True => (node (* => (node #[true_or:1000])))))
(False => (chain * => (node #[false_or:1000])))
(And => (chain * => (chain * => (chain * => (node #[and_or_right:1000])))))
(True => (chain * => (node #[true_or:1000]))))
-/
#guard_msgs in
#push_discr_tree Or
Expand Down