Move modules Permutation and Types

15 files changed, 24 insertions, 24 deletions

diff --git a/src/Data/Array/Mixed/Lemmas.hs b/src/Data/Array/Mixed/Lemmas.hs
index cfb7bc6..ded6af5 100644
--- a/src/Data/Array/Mixed/Lemmas.hs
+++ b/src/Data/Array/Mixed/Lemmas.hs
@@ -12,9 +12,9 @@ import Data.Proxy
 import Data.Type.Equality
 import GHC.TypeLits
 
-import Data.Array.Mixed.Permutation
-import Data.Array.Mixed.Types
 import Data.Array.Nested.Mixed.Shape
+import Data.Array.Nested.Permutation
+import Data.Array.Nested.Types
 
 
 -- * Reasoning helpers
diff --git a/src/Data/Array/Nested.hs b/src/Data/Array/Nested.hs
index 114fdc8..9801529 100644
--- a/src/Data/Array/Nested.hs
+++ b/src/Data/Array/Nested.hs
@@ -102,8 +102,8 @@ module Data.Array.Nested (
 
 import Prelude hiding (mappend, mconcat)
 
-import Data.Array.Mixed.Permutation
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Permutation
+import Data.Array.Nested.Types
 import Data.Array.Nested.Convert
 import Data.Array.Nested.Mixed
 import Data.Array.Nested.Ranked
diff --git a/src/Data/Array/Nested/Convert.hs b/src/Data/Array/Nested/Convert.hs
index c5cd293..d5e6008 100644
--- a/src/Data/Array/Nested/Convert.hs
+++ b/src/Data/Array/Nested/Convert.hs
@@ -27,7 +27,7 @@ import Data.Proxy
 import Data.Type.Equality
 
 import Data.Array.Mixed.Lemmas
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Types
 import Data.Array.Nested.Internal.Lemmas
 import Data.Array.Nested.Mixed
 import Data.Array.Nested.Mixed.Shape
diff --git a/src/Data/Array/Nested/Internal/Lemmas.hs b/src/Data/Array/Nested/Internal/Lemmas.hs
index f4bad70..b1589e0 100644
--- a/src/Data/Array/Nested/Internal/Lemmas.hs
+++ b/src/Data/Array/Nested/Internal/Lemmas.hs
@@ -10,8 +10,8 @@ import Data.Type.Equality
 import GHC.TypeLits
 
 import Data.Array.Mixed.Lemmas
-import Data.Array.Mixed.Permutation
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Permutation
+import Data.Array.Nested.Types
 import Data.Array.Nested.Mixed.Shape
 import Data.Array.Nested.Shaped.Shape
 
diff --git a/src/Data/Array/Nested/Mixed.hs b/src/Data/Array/Nested/Mixed.hs
index 373e62d..54bd5f2 100644
--- a/src/Data/Array/Nested/Mixed.hs
+++ b/src/Data/Array/Nested/Mixed.hs
@@ -43,8 +43,8 @@ import GHC.Generics (Generic)
 import GHC.TypeLits
 
 import Data.Array.Mixed.Lemmas
-import Data.Array.Mixed.Permutation
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Permutation
+import Data.Array.Nested.Types
 import Data.Array.XArray (XArray(..))
 import Data.Array.XArray qualified as X
 import Data.Array.Nested.Mixed.Shape
diff --git a/src/Data/Array/Nested/Mixed/Shape.hs b/src/Data/Array/Nested/Mixed/Shape.hs
index 6800f11..2f35ff9 100644
--- a/src/Data/Array/Nested/Mixed/Shape.hs
+++ b/src/Data/Array/Nested/Mixed/Shape.hs
@@ -39,7 +39,7 @@ import GHC.IsList (IsList)
 import GHC.IsList qualified as IsList
 import GHC.TypeLits
 
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Types
 
 
 -- | The length of a type-level list. If the argument is a shape, then the
diff --git a/src/Data/Array/Mixed/Permutation.hs b/src/Data/Array/Nested/Permutation.hs
index ef0afe3..031755f 100644
--- a/src/Data/Array/Mixed/Permutation.hs
+++ b/src/Data/Array/Nested/Permutation.hs
@@ -15,7 +15,7 @@
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -fplugin GHC.TypeLits.Normalise #-}
 {-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-}
-module Data.Array.Mixed.Permutation where
+module Data.Array.Nested.Permutation where
 
 import Data.Coerce (coerce)
 import Data.Functor.Const
@@ -29,8 +29,8 @@ import GHC.TypeError
 import GHC.TypeLits
 import GHC.TypeNats qualified as TN
 
-import Data.Array.Mixed.Types
 import Data.Array.Nested.Mixed.Shape
+import Data.Array.Nested.Types
 
 
 -- * Permutations
diff --git a/src/Data/Array/Nested/Ranked.hs b/src/Data/Array/Nested/Ranked.hs
index 74e3893..e5c51ef 100644
--- a/src/Data/Array/Nested/Ranked.hs
+++ b/src/Data/Array/Nested/Ranked.hs
@@ -30,8 +30,8 @@ import GHC.TypeLits
 import GHC.TypeNats qualified as TN
 
 import Data.Array.Mixed.Lemmas
-import Data.Array.Mixed.Permutation
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Permutation
+import Data.Array.Nested.Types
 import Data.Array.XArray (XArray(..))
 import Data.Array.XArray qualified as X
 import Data.Array.Nested.Convert
diff --git a/src/Data/Array/Nested/Ranked/Base.hs b/src/Data/Array/Nested/Ranked/Base.hs
index b7aa00f..f50f671 100644
--- a/src/Data/Array/Nested/Ranked/Base.hs
+++ b/src/Data/Array/Nested/Ranked/Base.hs
@@ -35,7 +35,7 @@ import Data.Foldable (toList)
 #endif
 
 import Data.Array.Mixed.Lemmas
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Types
 import Data.Array.XArray (XArray(..))
 import Data.Array.Nested.Mixed
 import Data.Array.Nested.Mixed.Shape
diff --git a/src/Data/Array/Nested/Ranked/Shape.hs b/src/Data/Array/Nested/Ranked/Shape.hs
index aa89d88..580bc59 100644
--- a/src/Data/Array/Nested/Ranked/Shape.hs
+++ b/src/Data/Array/Nested/Ranked/Shape.hs
@@ -28,7 +28,7 @@
 module Data.Array.Nested.Ranked.Shape where
 
 import Control.DeepSeq (NFData(..))
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Types
 import Data.Coerce (coerce)
 import Data.Foldable qualified as Foldable
 import Data.Kind (Type)
diff --git a/src/Data/Array/Nested/Shaped.hs b/src/Data/Array/Nested/Shaped.hs
index c442d6f..7e38aee 100644
--- a/src/Data/Array/Nested/Shaped.hs
+++ b/src/Data/Array/Nested/Shaped.hs
@@ -30,8 +30,8 @@ import Foreign.Storable (Storable)
 import GHC.TypeLits
 
 import Data.Array.Mixed.Lemmas
-import Data.Array.Mixed.Permutation
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Permutation
+import Data.Array.Nested.Types
 import Data.Array.XArray (XArray)
 import Data.Array.XArray qualified as X
 import Data.Array.Nested.Internal.Lemmas
diff --git a/src/Data/Array/Nested/Shaped/Base.hs b/src/Data/Array/Nested/Shaped/Base.hs
index ea9c24e..529ac21 100644
--- a/src/Data/Array/Nested/Shaped/Base.hs
+++ b/src/Data/Array/Nested/Shaped/Base.hs
@@ -30,7 +30,7 @@ import GHC.Float qualified (expm1, log1mexp, log1p, log1pexp)
 import GHC.Generics (Generic)
 import GHC.TypeLits
 
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Types
 import Data.Array.XArray (XArray)
 import Data.Array.Nested.Internal.Lemmas
 import Data.Array.Nested.Mixed
diff --git a/src/Data/Array/Nested/Shaped/Shape.hs b/src/Data/Array/Nested/Shaped/Shape.hs
index ac85e0e..3b33b05 100644
--- a/src/Data/Array/Nested/Shaped/Shape.hs
+++ b/src/Data/Array/Nested/Shaped/Shape.hs
@@ -28,7 +28,7 @@
 module Data.Array.Nested.Shaped.Shape where
 
 import Control.DeepSeq (NFData(..))
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Types
 import Data.Array.Shape qualified as O
 import Data.Coerce (coerce)
 import Data.Foldable qualified as Foldable
@@ -45,7 +45,7 @@ import GHC.IsList qualified as IsList
 import GHC.TypeLits
 
 import Data.Array.Mixed.Lemmas
-import Data.Array.Mixed.Permutation
+import Data.Array.Nested.Permutation
 import Data.Array.Nested.Mixed.Shape
 
 
diff --git a/src/Data/Array/Mixed/Types.hs b/src/Data/Array/Nested/Types.hs
index 3f5b1e7..90a499b 100644
--- a/src/Data/Array/Mixed/Types.hs
+++ b/src/Data/Array/Nested/Types.hs
@@ -12,7 +12,7 @@
 {-# LANGUAGE ViewPatterns #-}
 {-# OPTIONS_GHC -fplugin GHC.TypeLits.Normalise #-}
 {-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-}
-module Data.Array.Mixed.Types (
+module Data.Array.Nested.Types (
   -- * Reified evidence of a type class
   Dict(..),
 
diff --git a/src/Data/Array/XArray.hs b/src/Data/Array/XArray.hs
index 92e9ffb..dde06e3 100644
--- a/src/Data/Array/XArray.hs
+++ b/src/Data/Array/XArray.hs
@@ -32,8 +32,8 @@ import GHC.Generics (Generic)
 import GHC.TypeLits
 
 import Data.Array.Mixed.Lemmas
-import Data.Array.Mixed.Permutation
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Permutation
+import Data.Array.Nested.Types
 import Data.Array.Nested.Mixed.Shape
 import Data.Array.Strided.Orthotope