Skip to content
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

Jump to bottom

chore: de-mathlib lots of Data/List/Lemmas.lean #98

Merged
merged 5 commits into from
Mar 23, 2023
Merged

chore: de-mathlib lots of Data/List/Lemmas.lean #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66fde2f
chore: de-mathlib lots of Data/List/Lemmas.lean
JamesGallicchio Jan 31, 2023
acd6c8c
fix weird format thing
JamesGallicchio Jan 31, 2023
cc37b6b
simplify HashMap WF proof
JamesGallicchio Jan 31, 2023
93ffaf7
chore: review changes, golf
digama0 Feb 1, 2023
f05bb95
mark mem_map simp and clean up fallout
JamesGallicchio Feb 1, 2023
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
14 changes: 7 additions & 7 deletions Std/Data/HashMap/WF.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,12 @@ theorem WF.mapVal {α β γ} {f : α → β → γ} [BEq α] [Hashable α]
have ⟨h₁, h₂⟩ := H.out
simp [Imp.mapVal, Bucket.mapVal, WF_iff, h₁]; refine ⟨?_, ?_, fun i h => ?_⟩
· simp [Bucket.size]; congr; funext l; simp
· simp [List.forall_mem_map_iff, List.pairwise_map]
· simp only [Array.map_data, List.forall_mem_map_iff]
simp [List.pairwise_map]
exact fun _ => h₂.1 _
· simp [AssocList.All, List.forall_mem_map_iff] at h ⊢
exact h₂.2 _ h
· simp [AssocList.All] at h ⊢
rintro a x hx rfl
apply h₂.2 _ _ x hx

theorem WF.filterMap {α β γ} {f : α → β → Option γ} [BEq α] [Hashable α]
{m : Imp α β} (H : WF m) : WF (filterMap f m) := by
Expand Down Expand Up @@ -315,16 +317,14 @@ theorem WF.filterMap {α β γ} {f : α → β → Option γ} [BEq α] [Hashable
simp [Array.mapM_eq_mapM_data, bind, StateT.bind, H2]
intro bk sz h e'; cases e'
refine .mk (by simp [Bucket.size]) ⟨?_, fun i h => ?_⟩
· simp [List.forall_mem_map_iff]
· simp only [List.forall_mem_map_iff, List.toAssocList_toList]
refine fun l h => (List.pairwise_reverse.2 ?_).imp (mt PartialEquivBEq.symm)
have := H.out.2.1 _ h
rw [← List.pairwise_map (R := (¬ · == ·))] at this ⊢
exact this.sublist (H3 l.toList)
· simp [Array.getElem_eq_data_get] at h ⊢
have := H.out.2.2 _ h; simp [AssocList.All] at this ⊢
rw [← List.forall_mem_map_iff
(P := fun a => ((hash a).toUSize % m.buckets.val.data.length).toNat = i)] at this ⊢
exact fun _ h' => this _ ((H3 _).subset h')
rintro _ _ h' _ _ rfl; exact this _ h'

end Imp

Expand Down
2 changes: 1 addition & 1 deletion Std/Data/List/Init/Lemmas.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ These are theorems used in the definitions of `Std.Data.List.Basic`.
New theorems should be added to `Std.Data.List.Lemmas` if they are not needed by the bootstrap.
-/

attribute [simp] get get! get? reverseAux eraseIdx map join filterMap dropWhile find? findSome?
attribute [simp] get get! get? reverseAux eraseIdx map join dropWhile find? findSome?
replace elem lookup drop take takeWhile foldl foldr zipWith unzip range.loop enumFrom
intersperse isPrefixOf isEqv dropLast iota mapM.loop mapA List.forM forA filterAuxM
filterMapM.loop List.foldlM firstM anyM allM findM? findSomeM? forIn.loop forIn'.loop
Expand Down
Loading