Skip to content

Commit e2e5a28

Browse files
authored
Rename take-drop-id and take++drop (#2069)
A useful improvement to consistency of names,
1 parent e601a95 commit e2e5a28

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1246,6 +1246,8 @@ Deprecated names
12461246
12471247
zipWith-identityˡ ↦ zipWith-zeroˡ
12481248
zipWith-identityʳ ↦ zipWith-zeroʳ
1249+
1250+
take++drop ↦ take++drop≡id
12491251
```
12501252

12511253
* In `Data.List.NonEmpty.Properties`:
@@ -1401,6 +1403,8 @@ Deprecated names
14011403
[]≔-++-raise ↦ []≔-++-↑ʳ
14021404
idIsFold ↦ id-is-foldr
14031405
sum-++-commute ↦ sum-++
1406+
1407+
take-drop-id ↦ take++drop≡id
14041408
```
14051409
and the type of the proof `zipWith-comm` has been generalised from:
14061410
```

README/Data/List.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ lem₅ = refl
4848
open import Data.List.Properties
4949

5050
lem₆ : n (xs : List ℕ) take n xs ++ drop n xs ≡ xs
51-
lem₆ = take++drop
51+
lem₆ = take++drop≡id
5252

5353
lem₇ : (xs : List ℕ) reverse (reverse xs) ≡ xs
5454
lem₇ = reverse-involutive

src/Data/List/Properties.agda

+10-4
Original file line numberDiff line numberDiff line change
@@ -813,10 +813,10 @@ drop-[] : ∀ m → drop {A = A} m [] ≡ []
813813
drop-[] zero = refl
814814
drop-[] (suc m) = refl
815815

816-
take++drop : n (xs : List A) take n xs ++ drop n xs ≡ xs
817-
take++drop zero xs = refl
818-
take++drop (suc n) [] = refl
819-
take++drop (suc n) (x ∷ xs) = cong (x ∷_) (take++drop n xs)
816+
take++drop≡id : n (xs : List A) take n xs ++ drop n xs ≡ xs
817+
take++drop≡id zero xs = refl
818+
take++drop≡id (suc n) [] = refl
819+
take++drop≡id (suc n) (x ∷ xs) = cong (x ∷_) (take++drop≡id n xs)
820820

821821
drop-take-suc : (xs : List A) (i : Fin (length xs)) let m = toℕ i in
822822
drop m (take (suc m) xs) ≡ [ lookup xs i ]
@@ -1212,3 +1212,9 @@ zipWith-identityʳ = zipWith-zeroʳ
12121212
"Warning: zipWith-identityʳ was deprecated in v2.0.
12131213
Please use zipWith-zeroʳ instead."
12141214
#-}
1215+
1216+
take++drop = take++drop≡id
1217+
{-# WARNING_ON_USAGE take++drop
1218+
"Warning: take++drop was deprecated in v2.0.
1219+
Please use take++drop≡id instead."
1220+
#-}

src/Data/Vec/Properties.agda

+10-4
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,15 @@ drop-distr-map f (suc m) (x ∷ xs) = begin
140140
------------------------------------------------------------------------
141141
-- take and drop together
142142

143-
take-drop-id : (m : ℕ) (x : Vec A (m + n)) take m x ++ drop m x ≡ x
144-
take-drop-id zero x = refl
145-
take-drop-id (suc m) (x ∷ xs) = begin
143+
take++dropid : (m : ℕ) (x : Vec A (m + n)) take m x ++ drop m x ≡ x
144+
take++dropid zero x = refl
145+
take++dropid (suc m) (x ∷ xs) = begin
146146
take (suc m) (x ∷ xs) ++ drop (suc m) (x ∷ xs)
147147
≡⟨ cong₂ _++_ (unfold-take m x xs) (unfold-drop m x xs) ⟩
148148
(x ∷ take m xs) ++ (drop m xs)
149149
≡⟨⟩
150150
x ∷ (take m xs ++ drop m xs)
151-
≡⟨ cong (x ∷_) (take-drop-id m xs) ⟩
151+
≡⟨ cong (x ∷_) (take++dropid m xs) ⟩
152152
x ∷ xs
153153
154154

@@ -1186,3 +1186,9 @@ sum-++-commute = sum-++
11861186
"Warning: sum-++-commute was deprecated in v2.0.
11871187
Please use sum-++ instead."
11881188
#-}
1189+
1190+
take-drop-id = take++drop≡id
1191+
{-# WARNING_ON_USAGE take-drop-id
1192+
"Warning: take-drop-id was deprecated in v2.0.
1193+
Please use take++drop≡id instead."
1194+
#-}

0 commit comments

Comments
 (0)