An alternative to #1698

CHANGELOG.md

@@ -518,6 +518,10 @@ Deprecated modules
  Relation.Binary.Properties.MeetSemilattice.agda ↦ Relation.Binary.Lattice.Properties.MeetSemilattice.agda
  ```
 
+### Deprecation of `Data.Nat.Properties.Core`
+
+* The module `Data.Nat.Properties.Core` has been deprecated, and its one entry moved to `Data.Nat.Properties`
+
 Deprecated names
 ----------------
 
@@ -1003,6 +1007,8 @@ Other minor changes
  combine-surjective : ∀ x → ∃₂ λ y z → combine y z ≡ x
 
  lower₁-injective : lower₁ i n≢i ≡ lower₁ j n≢j → i ≡ j
+
+ i<1+i : i < suc i
  ```
 
 * Added new functions in `Data.Integer.Base`:
@@ -1065,6 +1071,16 @@ Other minor changes
  ∷ʳ-++ : xs ∷ʳ a ++ ys ≡ xs ++ a ∷ ys
  ```
 
+* Added new patterns and definitions to `Data.Nat.Base`:
+ ```agda
+ pattern z<s {n} = s≤s (z≤n {n})
+ pattern s<s {m} {n} m<n = s≤s {m} {n} m<n
+
+ pattern <′-base = ≤′-refl
+ pattern <′-step {n} m<′n = ≤′-step {n} m<′n
+ ```
+
+
 * Added new definitions and proofs to `Data.Nat.Primality`:
  ```agda
  Composite : ℕ → Set
@@ -1087,6 +1103,17 @@ Other minor changes
  m*n≢0 : .{{_ : NonZero m}} .{{_ : NonZero n}} → NonZero (m * n)
  m≤n⇒n∸m≤n : m ≤ n → n ∸ m ≤ n
 
+ ≤-pred : suc m ≤ suc n → m ≤ n
+ s<s-injective : ∀ {p q : m < n} → s<s p ≡ s<s q → p ≡ q
+ <-pred : suc m < suc n → m < n
+ <-step : m < n → m < 1 + n
+ m<1+n⇒m<n∨m≡n : m < suc n → m < n ⊎ m ≡ n
+
+ z<′s : zero <′ suc n
+ s<′s : m <′ n → suc m <′ suc n
+ <⇒<′ : m < n → m <′ n
+ <′⇒< : m <′ n → m < n
+
  1≤n! : 1 ≤ n !
  _!≢0 : NonZero (n !)
  _!*_!≢0 : NonZero (m ! * n !)

src/Data/Fin/Base.agda

@@ -13,8 +13,7 @@
 module Data.Fin.Base where
 
 open import Data.Empty using (⊥-elim)
-open import Data.Nat.Base as ℕ using (ℕ; zero; suc; z≤n; s≤s; _^_)
-open import Data.Nat.Properties.Core using (≤-pred)
+open import Data.Nat.Base as ℕ using (ℕ; zero; suc; z≤n; s≤s; z<s; s<s; _^_)
 open import Data.Product as Product using (_×_; _,_; proj₁; proj₂)
 open import Data.Sum.Base as Sum using (_⊎_; inj₁; inj₂; [_,_]′)
 open import Function.Base using (id; _∘_; _on_; flip)
@@ -67,8 +66,8 @@ fromℕ (suc n) = suc (fromℕ n)
 -- fromℕ< {m} _ = "m".
 
 fromℕ< : ∀ {m n} → m ℕ.< n → Fin n
-fromℕ< {zero} {suc n} m≤n = zero
-fromℕ< {suc m} {suc n} m≤n = suc (fromℕ< (≤-pred m≤n))
+fromℕ< {zero} {suc n} z<s = zero
+fromℕ< {suc m} {suc n} (s<s m<n) = suc (fromℕ< m<n)
 
 -- fromℕ<″ m _ = "m".
 
@@ -112,8 +111,8 @@ inject₁ zero = zero
 inject₁ (suc i) = suc (inject₁ i)
 
 inject≤ : ∀ {m n} → Fin m → m ℕ.≤ n → Fin n
-inject≤ {_} {suc n} zero le = zero
-inject≤ {_} {suc n} (suc i) le = suc (inject≤ i (≤-pred le))
+inject≤ {_} {suc n} zero _  = zero
+inject≤ {_} {suc n} (suc i) (s≤s m≤n) = suc (inject≤ i m≤n)
 
 -- lower₁ "i" _ = "i".
 

src/Data/Fin/Induction.agda

@@ -8,7 +8,7 @@
 
 open import Data.Fin.Base
 open import Data.Fin.Properties
-open import Data.Nat.Base as ℕ using (ℕ; zero; suc; z≤n; s≤s; _∸_)
+open import Data.Nat.Base as ℕ using (ℕ; zero; suc; _∸_)
 import Data.Nat.Induction as ℕ
 import Data.Nat.Properties as ℕ
 open import Induction
@@ -46,15 +46,15 @@ open WF public using (Acc; acc)
  induct : ∀ {i} → Acc _<_ i → P i
  induct {zero} _ = P₀
  induct {suc i} (acc rec) = Pᵢ⇒Pᵢ₊₁ i (induct (rec (inject₁ i) i<i+1))
- where i<i+1 = s≤s (ℕ.≤-reflexive (toℕ-inject₁ i))
+ where i<i+1 = ℕ<⇒inject₁< (i<1+i i)
 
 ------------------------------------------------------------------------
 -- Induction over _>_
 
 private
  acc-map : ∀ {x : Fin n} → Acc ℕ._<_ (n ∸ toℕ x) → Acc _>_ x
- acc-map {n} (acc rs) = acc (λ y y>x →
- acc-map (rs (n ∸ toℕ y) (ℕ.∸-monoʳ-< y>x (toℕ≤n y))))
+ acc-map {n} (acc rs) = acc λ y y>x →
+ acc-map (rs (n ∸ toℕ y) (ℕ.∸-monoʳ-< y>x (toℕ≤n y)))
 
 >-wellFounded : WellFounded {A = Fin n} _>_
 >-wellFounded {n} x = acc-map (ℕ.<-wellFounded (n ∸ toℕ x))
@@ -69,7 +69,7 @@ private
  induct {i} (acc rec) with n ℕ.≟ toℕ i
  ... | yes n≡i = subst P (toℕ-injective (trans (toℕ-fromℕ n) n≡i)) Pₙ
  ... | no n≢i = subst P (inject₁-lower₁ i n≢i) (Pᵢ₊₁⇒Pᵢ _ Pᵢ₊₁)
- where Pᵢ₊₁ = induct (rec _ (s≤s (ℕ.≤-reflexive (sym (toℕ-lower₁ i n≢i)))))
+ where Pᵢ₊₁ = induct (rec _ (ℕ.≤-reflexive (cong suc (sym (toℕ-lower₁ i n≢i)))))
 
 ------------------------------------------------------------------------
 -- Induction over _≺_