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.

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

Rename take-drop-id and take++drop #2069

Merged
merged 1 commit into from
Aug 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -1239,6 +1239,8 @@ Deprecated names

zipWith-identityˡ ↦ zipWith-zeroˡ
zipWith-identityʳ ↦ zipWith-zeroʳ

take++drop ↦ take++drop≡id
```

* In `Data.List.NonEmpty.Properties`:
Expand Down Expand Up @@ -1394,6 +1396,8 @@ Deprecated names
[]≔-++-raise ↦ []≔-++-↑ʳ
idIsFold ↦ id-is-foldr
sum-++-commute ↦ sum-++

take-drop-id ↦ take++drop≡id
```
and the type of the proof `zipWith-comm` has been generalised from:
```
Expand Down
2 changes: 1 addition & 1 deletion README/Data/List.agda
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ lem₅ = refl
open import Data.List.Properties

lem₆ : ∀ n (xs : List ℕ) → take n xs ++ drop n xs ≡ xs
lem₆ = take++drop
lem₆ = take++drop≡id

lem₇ : ∀ (xs : List ℕ) → reverse (reverse xs) ≡ xs
lem₇ = reverse-involutive
Expand Down
14 changes: 10 additions & 4 deletions src/Data/List/Properties.agda
Original file line number Diff line number Diff line change
Expand Up @@ -813,10 +813,10 @@ drop-[] : ∀ m → drop {A = A} m [] ≡ []
drop-[] zero = refl
drop-[] (suc m) = refl

take++drop : ∀ n (xs : List A) → take n xs ++ drop n xs ≡ xs
take++drop zero xs = refl
take++drop (suc n) [] = refl
take++drop (suc n) (x ∷ xs) = cong (x ∷_) (take++drop n xs)
take++drop≡id : ∀ n (xs : List A) → take n xs ++ drop n xs ≡ xs
take++drop≡id zero xs = refl
take++drop≡id (suc n) [] = refl
take++drop≡id (suc n) (x ∷ xs) = cong (x ∷_) (take++drop≡id n xs)

drop-take-suc : (xs : List A) (i : Fin (length xs)) → let m = toℕ i in
drop m (take (suc m) xs) ≡ [ lookup xs i ]
Expand Down Expand Up @@ -1206,3 +1206,9 @@ zipWith-identityʳ = zipWith-zeroʳ
"Warning: zipWith-identityʳ was deprecated in v2.0.
Please use zipWith-zeroʳ instead."
#-}

take++drop = take++drop≡id
{-# WARNING_ON_USAGE take++drop
"Warning: take++drop was deprecated in v2.0.
Please use take++drop≡id instead."
#-}
14 changes: 10 additions & 4 deletions src/Data/Vec/Properties.agda
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,15 @@ drop-distr-map f (suc m) (x ∷ xs) = begin
------------------------------------------------------------------------
-- take and drop together

take-drop-id : ∀ (m : ℕ) (x : Vec A (m + n)) → take m x ++ drop m x ≡ x
take-drop-id zero x = refl
take-drop-id (suc m) (x ∷ xs) = begin
take++dropid : ∀ (m : ℕ) (x : Vec A (m + n)) → take m x ++ drop m x ≡ x
take++dropid zero x = refl
take++dropid (suc m) (x ∷ xs) = begin
take (suc m) (x ∷ xs) ++ drop (suc m) (x ∷ xs)
≡⟨ cong₂ _++_ (unfold-take m x xs) (unfold-drop m x xs) ⟩
(x ∷ take m xs) ++ (drop m xs)
≡⟨⟩
x ∷ (take m xs ++ drop m xs)
≡⟨ cong (x ∷_) (take-drop-id m xs) ⟩
≡⟨ cong (x ∷_) (take++dropid m xs) ⟩
x ∷ xs

Expand Down Expand Up @@ -1186,3 +1186,9 @@ sum-++-commute = sum-++
"Warning: sum-++-commute was deprecated in v2.0.
Please use sum-++ instead."
#-}

take-drop-id = take++drop≡id
{-# WARNING_ON_USAGE take-drop-id
"Warning: take-drop-id was deprecated in v2.0.
Please use take++drop≡id instead."
#-}
Loading