Skip to content

Commit 098b4cf

Browse files
[Import] Data.* (agda#2621)
* Import cleaning Data 2 * fix --------- Co-authored-by: Jacques Carette <[email protected]>
1 parent 547a06a commit 098b4cf

File tree

14 files changed

+73
-58
lines changed

14 files changed

+73
-58
lines changed

src/Data/Bool/Properties.agda

+26-19
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,41 @@
88

99
module Data.Bool.Properties where
1010
open import Algebra.Bundles
11-
open import Algebra.Lattice.Bundles using
12-
(BooleanAlgebra; DistributiveLattice; Lattice; Semilattice)
11+
using (Magma; Semigroup; Band; CommutativeMonoid
12+
; IdempotentCommutativeMonoid; CommutativeSemiring; CommutativeRing)
13+
open import Algebra.Lattice.Bundles
14+
using (Lattice; DistributiveLattice; BooleanAlgebra; Semilattice)
1315
import Algebra.Lattice.Properties.BooleanAlgebra as BooleanAlgebraProperties
14-
open import Data.Bool.Base using (Bool; T; _<_; _≤_; _∧_; _∨_; _xor_; b≤b; f<t;
15-
f≤t; false; if_then_else_; not; true)
16+
open import Data.Bool.Base
17+
using (Bool; true; false; not; _∧_; _∨_; _xor_ ; if_then_else_; T; _≤_; _<_
18+
; b≤b; f≤t; f<t)
1619
open import Data.Empty using (⊥; ⊥-elim)
17-
open import Data.Product.Base using (_,_; _×_; proj₁; proj₂)
18-
open import Data.Sum.Base using ([_,_]; _⊎_; inj₁; inj₂)
20+
open import Data.Product.Base using (_×_; _,_; proj₁; proj₂)
21+
open import Data.Sum.Base using (_⊎_; inj₁; inj₂; [_,_])
1922
open import Function.Base using (_⟨_⟩_; const; id)
2023
open import Function.Bundles hiding (Inverse; LeftInverse; RightInverse)
2124
open import Induction.WellFounded using (Acc; WellFounded; acc)
2225
open import Level using (0ℓ; Level)
2326
open import Relation.Binary.Bundles using (DecSetoid; DecTotalOrder; Poset;
2427
Preorder; Setoid; StrictPartialOrder; StrictTotalOrder; TotalOrder)
2528
open import Relation.Binary.Core using (_⇒_)
26-
open import Relation.Binary.Definitions using (Antisymmetric; Asymmetric;
27-
Decidable; DecidableEquality; Irreflexive; Irrelevant; Maximum; Minimum;
28-
Reflexive; Total; Trans; Transitive; Trichotomous; _Respects₂_;
29-
tri<; tri>; tri≈)
30-
open import Relation.Binary.PropositionalEquality.Core using (_≡_; _≢_;
31-
cong; cong₂; refl; subst; sym; trans)
32-
open import Relation.Binary.PropositionalEquality.Properties using
33-
(decSetoid; isEquivalence; module ≡-Reasoning; setoid)
34-
open import Relation.Binary.Structures using (IsDecTotalOrder;
35-
IsPartialOrder; IsPreorder; IsStrictPartialOrder; IsStrictTotalOrder;
36-
IsTotalOrder)
37-
open import Relation.Nullary.Decidable.Core using (True; fromWitness; no; yes)
38-
import Relation.Unary as U using (Irrelevant)
29+
open import Relation.Binary.Structures
30+
using (IsPreorder; IsPartialOrder; IsTotalOrder; IsDecTotalOrder
31+
; IsStrictPartialOrder; IsStrictTotalOrder)
32+
open import Relation.Binary.Bundles
33+
using (Setoid; DecSetoid; Poset; Preorder; TotalOrder; DecTotalOrder
34+
; StrictPartialOrder; StrictTotalOrder)
35+
open import Relation.Binary.Definitions
36+
using (Decidable; DecidableEquality ; Reflexive; Transitive; Antisymmetric
37+
; Minimum; Maximum; Total; Irrelevant ; Irreflexive; Asymmetric; Trans
38+
; Trichotomous; tri≈; tri<; tri>; _Respects₂_)
39+
open import Relation.Binary.PropositionalEquality.Core
40+
using (_≡_; refl; sym; cong; cong₂; subst; trans; _≢_)
41+
open import Relation.Binary.PropositionalEquality.Properties
42+
using (module ≡-Reasoning; setoid; decSetoid; isEquivalence)
43+
open import Relation.Nullary.Decidable.Core
44+
using (True; yes; no; fromWitness ; toWitness)
45+
import Relation.Unary as U
3946

4047
open import Algebra.Definitions {A = Bool} _≡_
4148
open import Algebra.Structures {A = Bool} _≡_

src/Data/Bool/Solver.agda

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ module Data.Bool.Solver where
1313
import Algebra.Solver.Ring.Simple as Solver
1414
import Algebra.Solver.Ring.AlmostCommutativeRing as ACR
1515
open import Data.Bool.Properties
16+
using (_≟_; ∨-∧-commutativeSemiring; xor-∧-commutativeRing)
1617

1718
------------------------------------------------------------------------
1819
-- A module for automatically solving propositional equivalences

src/Data/Bytestring/Base.agda

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99

1010
module Data.Bytestring.Base where
1111

12-
open import Data.Nat.Base using (ℕ; _+_; _*_; _^_)
1312
open import Agda.Builtin.String using (String)
13+
open import Data.Nat.Base using (ℕ; _+_; _*_; _^_)
1414
import Data.Fin.Base as Fin
1515
open import Data.Vec.Base as Vec using (Vec)
1616
open import Data.Word8.Base as Word8 using (Word8)
1717
open import Data.Word64.Base as Word64 using (Word64)
18-
1918
open import Function.Base using (const; _$_)
2019

2120
------------------------------------------------------------------------------

src/Data/Bytestring/Builder/Primitive.agda

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88

99
module Data.Bytestring.Builder.Primitive where
1010

11-
open import Agda.Builtin.Nat
12-
open import Agda.Builtin.String
13-
14-
open import Data.Word8.Primitive
11+
open import Agda.Builtin.String using (String)
1512
open import Data.Bytestring.Primitive using (Bytestring)
13+
open import Data.Word8.Primitive using (Word8)
1614

1715
infixr 6 _<>_
1816

src/Data/Bytestring/IO.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
module Data.Bytestring.IO where
1010

11-
open import Agda.Builtin.String
11+
open import Agda.Builtin.String using (String)
1212
open import IO using (IO; lift)
1313
open import Data.Bytestring.Base using (Bytestring)
1414
open import Data.Unit.Base using (⊤)

src/Data/Bytestring/IO/Primitive.agda

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ module Data.Bytestring.IO.Primitive where
1010

1111
open import Agda.Builtin.String using (String)
1212
open import Agda.Builtin.Unit using (⊤)
13+
open import Data.Bytestring.Primitive using (Bytestring)
1314
open import IO.Primitive.Core using (IO)
1415

15-
open import Data.Bytestring.Primitive
16-
1716
postulate
1817
readFile : String IO Bytestring
1918
writeFile : String Bytestring IO ⊤

src/Data/Char/Base.agda

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
module Data.Char.Base where
1010

11-
open import Level using (zero)
12-
import Data.Nat.Base as ℕ
11+
import Data.Nat.Base as ℕ using (_<_; _≡ᵇ_)
1312
open import Data.Bool.Base using (Bool)
1413
open import Function.Base using (_on_)
14+
open import Level using (zero)
1515
open import Relation.Binary.Core using (Rel)
16-
open import Relation.Binary.PropositionalEquality.Core
17-
open import Relation.Binary.Construct.Closure.Reflexive
16+
open import Relation.Binary.PropositionalEquality.Core using (_≡_; _≢_)
17+
open import Relation.Binary.Construct.Closure.Reflexive using (ReflClosure)
1818

1919
------------------------------------------------------------------------
2020
-- Re-export the type, and renamed primitives

src/Data/Char/Instances.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
module Data.Char.Instances where
1010

11-
open import Data.Char.Properties
11+
open import Data.Char.Properties using (isDecEquivalence)
1212

1313
instance
1414
Char-≡-isDecEquivalence = isDecEquivalence

src/Data/Char/Properties.agda

+20-9
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,38 @@
99
module Data.Char.Properties where
1010

1111
open import Data.Bool.Base using (Bool)
12-
open import Data.Char.Base
13-
import Data.Nat.Base as ℕ
12+
open import Data.Char.Base using (Char; _≈_; _≉_; _<_; _≤_; toℕ)
13+
import Data.Nat.Base as ℕ using (ℕ; _<_; _≤_)
1414
import Data.Nat.Properties as ℕ
15+
using (_<?_; <-cmp; <-isStrictPartialOrder; <-isStrictTotalOrder
16+
; <-strictPartialOrder; <-strictTotalOrder; <-irrefl; <-trans; <-asym
17+
; _≟_)
1518
open import Data.Product.Base using (_,_)
16-
17-
open import Function.Base
19+
open import Function.Base using (const; _∘′_)
1820
open import Relation.Nullary using (¬_; yes; no)
1921
open import Relation.Nullary.Decidable using (map′; isYes)
2022
open import Relation.Binary.Core using (_⇒_)
2123
open import Relation.Binary.Bundles
22-
using (Setoid; DecSetoid; StrictPartialOrder; StrictTotalOrder; Preorder; Poset; DecPoset)
24+
using (Setoid; DecSetoid; StrictPartialOrder; StrictTotalOrder; Preorder
25+
; Poset; DecPoset)
2326
open import Relation.Binary.Structures
24-
using (IsDecEquivalence; IsStrictPartialOrder; IsStrictTotalOrder; IsPreorder; IsPartialOrder; IsDecPartialOrder; IsEquivalence)
27+
using (IsDecEquivalence; IsStrictPartialOrder; IsStrictTotalOrder
28+
; IsPreorder; IsPartialOrder; IsDecPartialOrder; IsEquivalence)
2529
open import Relation.Binary.Definitions
26-
using (Decidable; DecidableEquality; Trichotomous; Irreflexive; Transitive; Asymmetric; Antisymmetric; Symmetric; Substitutive; Reflexive; tri<; tri≈; tri>)
30+
using (Decidable; DecidableEquality; Trichotomous; Irreflexive
31+
; Transitive; Asymmetric; Antisymmetric; Symmetric; Substitutive
32+
; Reflexive; tri<; tri≈; tri>)
2733
import Relation.Binary.Construct.On as On
28-
import Relation.Binary.Construct.Subst.Equality as Subst
34+
using (decidable; transitive; asymmetric; isStrictPartialOrder
35+
; isStrictTotalOrder; strictPartialOrder; strictTotalOrder)
2936
import Relation.Binary.Construct.Closure.Reflexive as Refl
37+
using (Refl; reflexive)
3038
import Relation.Binary.Construct.Closure.Reflexive.Properties as Refl
39+
using (trans; antisym; decidable)
3140
open import Relation.Binary.PropositionalEquality.Core as ≡
3241
using (_≡_; _≢_; refl; cong; sym; trans; subst)
33-
import Relation.Binary.PropositionalEquality.Properties as ≡
42+
import Relation.Binary.PropositionalEquality.Properties as ≡ using
43+
(isDecEquivalence; setoid; decSetoid; isEquivalence)
3444

3545
------------------------------------------------------------------------
3646
-- Primitive properties
@@ -303,3 +313,4 @@ Please use <-strictPartialOrder instead."
303313
"Warning: <-strictTotalOrder-≈ was deprecated in v1.5.
304314
Please use <-strictTotalOrder instead."
305315
#-}
316+

src/Data/Container/Indexed/Core.agda

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
module Data.Container.Indexed.Core where
1010

11-
open import Level
11+
open import Level using (Level; _⊔_; suc)
1212
open import Data.Product.Base using (Σ; Σ-syntax; _,_; ∃)
13-
open import Relation.Unary
13+
open import Relation.Unary using (Pred)
1414

1515
private variable
1616
i o c r ℓ ℓ′ : Level

src/Data/Container/Indexed/FreeMonad.agda

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88

99
module Data.Container.Indexed.FreeMonad where
1010

11-
open import Level
11+
open import Level using (Level; _⊔_; lower)
1212
open import Function.Base hiding (const)
13-
open import Effect.Monad.Predicate
14-
open import Data.Container.Indexed
13+
open import Effect.Monad.Predicate using (RawPMonad)
14+
open import Data.Container.Indexed using (Container; Command; Response; next; ⟦_⟧; μ)
1515
open import Data.Container.Indexed.Combinator hiding (id; _∘_)
16-
open import Data.Empty
16+
open import Data.Empty using (⊥; ⊥-elim)
1717
open import Data.Sum.Base using (inj₁; inj₂)
1818
open import Data.Product.Base using (_,_)
19-
open import Data.W.Indexed
20-
open import Relation.Unary
21-
open import Relation.Unary.PredicateTransformer
19+
open import Data.W.Indexed using (sup)
20+
open import Relation.Unary using (Pred; _⊆_; ⋃; _∈_; {_})
21+
open import Relation.Unary.PredicateTransformer using (Pt)
2222
open import Relation.Binary.PropositionalEquality.Core using (refl)
2323

2424
------------------------------------------------------------------------

src/Data/Container/Indexed/Relation/Binary/Equality/Setoid.agda

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ module Data.Container.Indexed.Relation.Binary.Equality.Setoid
1414

1515
open import Function
1616
open import Level using (Level; _⊔_; suc)
17-
open import Relation.Binary
18-
19-
open import Data.Container.Indexed.Core
20-
open import Data.Container.Indexed.Relation.Binary.Pointwise
17+
open import Relation.Binary using (Reflexive; Symmetric; Transitive; IsEquivalence)
18+
open import Relation.Binary.Core using (Rel)
19+
open import Data.Container.Indexed.Core using (Container; ⟦_⟧)
20+
open import Data.Container.Indexed.Relation.Binary.Pointwise using (Pointwise)
2121
import Data.Container.Indexed.Relation.Binary.Pointwise.Properties
2222
as Pointwise
2323

src/Data/Container/Indexed/Relation/Binary/Pointwise.agda

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
module Data.Container.Indexed.Relation.Binary.Pointwise where
1010

1111
open import Data.Product.Base using (_,_; Σ-syntax)
12+
open import Data.Container.Indexed.Core using (Container; Subtrees; ⟦_⟧)
1213
open import Function.Base using (_∘_)
1314
open import Level using (Level; _⊔_)
1415
open import Relation.Binary using (REL; _⇒_)
1516
open import Relation.Binary.PropositionalEquality.Core using (_≡_; refl)
1617

17-
open import Data.Container.Indexed.Core using (Container; Subtrees; ⟦_⟧)
18-
1918
private variable
2019
ℓᵉ ℓᵉ′ ℓᵖ ℓˢ ℓˣ ℓʸ : Level
2120
I O : Set _

src/Data/Container/Indexed/WithK.agda

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ open import Data.Container.Indexed hiding (module PlainMorphism)
1818
open import Data.Product.Base
1919
using (_,_; -,_; _×_; ∃; proj₁; proj₂; Σ-syntax)
2020
open import Function.Base renaming (id to ⟨id⟩; _∘_ to _⟨∘⟩_)
21-
open import Level
21+
open import Level using (Level; _⊔_)
2222
open import Relation.Unary using (Pred; _⊆_)
2323
open import Relation.Binary.PropositionalEquality.Core as ≡ using (_≡_; refl)
2424
open import Relation.Binary.HeterogeneousEquality as ≅ using (_≅_; refl)
2525
open import Relation.Binary.Indexed.Heterogeneous
26+
using (IndexedSetoid; Transitive; Symmetric; IREL; IRel)
2627

2728
------------------------------------------------------------------------
2829

0 commit comments

Comments
 (0)