aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Data/Array/Arith.hs (renamed from src/Data/Array/Mixed/Internal/Arith.hs)4
-rw-r--r--src/Data/Array/Mixed/Lemmas.hs2
-rw-r--r--src/Data/Array/Mixed/Permutation.hs2
-rw-r--r--src/Data/Array/Nested.hs8
-rw-r--r--src/Data/Array/Nested/Convert.hs (renamed from src/Data/Array/Nested/Internal/Convert.hs)10
-rw-r--r--src/Data/Array/Nested/Internal/Lemmas.hs2
-rw-r--r--src/Data/Array/Nested/Mixed.hs (renamed from src/Data/Array/Nested/Internal/Mixed.hs)10
-rw-r--r--src/Data/Array/Nested/Ranked.hs (renamed from src/Data/Array/Nested/Internal/Ranked.hs)8
-rw-r--r--src/Data/Array/Nested/Shaped.hs (renamed from src/Data/Array/Nested/Internal/Shaped.hs)10
-rw-r--r--src/Data/Array/XArray.hs (renamed from src/Data/Array/Mixed/XArray.hs)6
10 files changed, 31 insertions, 31 deletions
diff --git a/src/Data/Array/Mixed/Internal/Arith.hs b/src/Data/Array/Arith.hs
index ebda388..1eae737 100644
--- a/src/Data/Array/Mixed/Internal/Arith.hs
+++ b/src/Data/Array/Arith.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE ImportQualifiedPost #-}
-module Data.Array.Mixed.Internal.Arith (
- module Data.Array.Mixed.Internal.Arith,
+module Data.Array.Arith (
+ module Data.Array.Arith,
module Data.Array.Strided.Arith,
) where
diff --git a/src/Data/Array/Mixed/Lemmas.hs b/src/Data/Array/Mixed/Lemmas.hs
index ca82573..7b3365b 100644
--- a/src/Data/Array/Mixed/Lemmas.hs
+++ b/src/Data/Array/Mixed/Lemmas.hs
@@ -13,8 +13,8 @@ import Data.Type.Equality
import GHC.TypeLits
import Data.Array.Mixed.Permutation
-import Data.Array.Nested.Mixed.Shape
import Data.Array.Mixed.Types
+import Data.Array.Nested.Mixed.Shape
-- * Reasoning helpers
diff --git a/src/Data/Array/Mixed/Permutation.hs b/src/Data/Array/Mixed/Permutation.hs
index 22672cb..ef0afe3 100644
--- a/src/Data/Array/Mixed/Permutation.hs
+++ b/src/Data/Array/Mixed/Permutation.hs
@@ -29,8 +29,8 @@ import GHC.TypeError
import GHC.TypeLits
import GHC.TypeNats qualified as TN
-import Data.Array.Nested.Mixed.Shape
import Data.Array.Mixed.Types
+import Data.Array.Nested.Mixed.Shape
-- * Permutations
diff --git a/src/Data/Array/Nested.hs b/src/Data/Array/Nested.hs
index 8198a54..9faf6d7 100644
--- a/src/Data/Array/Nested.hs
+++ b/src/Data/Array/Nested.hs
@@ -105,10 +105,10 @@ import Prelude hiding (mappend, mconcat)
import Data.Array.Mixed.Permutation
import Data.Array.Mixed.Types
-import Data.Array.Nested.Internal.Convert
-import Data.Array.Nested.Internal.Mixed
-import Data.Array.Nested.Internal.Ranked
-import Data.Array.Nested.Internal.Shaped
+import Data.Array.Nested.Convert
+import Data.Array.Nested.Mixed
+import Data.Array.Nested.Ranked
+import Data.Array.Nested.Shaped
import Data.Array.Nested.Mixed.Shape
import Data.Array.Nested.Ranked.Shape
import Data.Array.Nested.Shaped.Shape
diff --git a/src/Data/Array/Nested/Internal/Convert.hs b/src/Data/Array/Nested/Convert.hs
index 5d6cee4..639f5fd 100644
--- a/src/Data/Array/Nested/Internal/Convert.hs
+++ b/src/Data/Array/Nested/Convert.hs
@@ -5,20 +5,20 @@
{-# LANGUAGE TypeAbstractions #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeOperators #-}
-module Data.Array.Nested.Internal.Convert where
+module Data.Array.Nested.Convert where
import Control.Category
import Data.Proxy
import Data.Type.Equality
import Data.Array.Mixed.Lemmas
-import Data.Array.Nested.Mixed.Shape
import Data.Array.Mixed.Types
import Data.Array.Nested.Internal.Lemmas
-import Data.Array.Nested.Internal.Mixed
-import Data.Array.Nested.Internal.Ranked
+import Data.Array.Nested.Mixed
+import Data.Array.Nested.Mixed.Shape
+import Data.Array.Nested.Ranked
+import Data.Array.Nested.Shaped
import Data.Array.Nested.Shaped.Shape
-import Data.Array.Nested.Internal.Shaped
stoRanked :: Elt a => Shaped sh a -> Ranked (Rank sh) a
diff --git a/src/Data/Array/Nested/Internal/Lemmas.hs b/src/Data/Array/Nested/Internal/Lemmas.hs
index b8baf96..f4bad70 100644
--- a/src/Data/Array/Nested/Internal/Lemmas.hs
+++ b/src/Data/Array/Nested/Internal/Lemmas.hs
@@ -11,8 +11,8 @@ import GHC.TypeLits
import Data.Array.Mixed.Lemmas
import Data.Array.Mixed.Permutation
-import Data.Array.Nested.Mixed.Shape
import Data.Array.Mixed.Types
+import Data.Array.Nested.Mixed.Shape
import Data.Array.Nested.Shaped.Shape
diff --git a/src/Data/Array/Nested/Internal/Mixed.hs b/src/Data/Array/Nested/Mixed.hs
index b76aa50..ec19c21 100644
--- a/src/Data/Array/Nested/Internal/Mixed.hs
+++ b/src/Data/Array/Nested/Mixed.hs
@@ -16,7 +16,7 @@
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE UndecidableInstances #-}
{-# LANGUAGE ViewPatterns #-}
-module Data.Array.Nested.Internal.Mixed where
+module Data.Array.Nested.Mixed where
import Prelude hiding (mconcat)
@@ -42,13 +42,13 @@ import GHC.Generics (Generic)
import GHC.TypeLits
import Unsafe.Coerce (unsafeCoerce)
-import Data.Array.Mixed.Internal.Arith
+import Data.Array.Arith
import Data.Array.Mixed.Lemmas
import Data.Array.Mixed.Permutation
-import Data.Array.Nested.Mixed.Shape
import Data.Array.Mixed.Types
-import Data.Array.Mixed.XArray (XArray(..))
-import Data.Array.Mixed.XArray qualified as X
+import Data.Array.XArray (XArray(..))
+import Data.Array.XArray qualified as X
+import Data.Array.Nested.Mixed.Shape
import Data.Bag
diff --git a/src/Data/Array/Nested/Internal/Ranked.hs b/src/Data/Array/Nested/Ranked.hs
index 368e337..e2074ac 100644
--- a/src/Data/Array/Nested/Internal/Ranked.hs
+++ b/src/Data/Array/Nested/Ranked.hs
@@ -17,7 +17,7 @@
{-# LANGUAGE ViewPatterns #-}
{-# OPTIONS_GHC -fplugin GHC.TypeLits.Normalise #-}
{-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-}
-module Data.Array.Nested.Internal.Ranked where
+module Data.Array.Nested.Ranked where
import Prelude hiding (mappend, mconcat)
@@ -41,9 +41,9 @@ import GHC.TypeNats qualified as TN
import Data.Array.Mixed.Lemmas
import Data.Array.Mixed.Permutation
import Data.Array.Mixed.Types
-import Data.Array.Mixed.XArray (XArray(..))
-import Data.Array.Mixed.XArray qualified as X
-import Data.Array.Nested.Internal.Mixed
+import Data.Array.XArray (XArray(..))
+import Data.Array.XArray qualified as X
+import Data.Array.Nested.Mixed
import Data.Array.Nested.Mixed.Shape
import Data.Array.Nested.Ranked.Shape
import Data.Array.Strided.Arith
diff --git a/src/Data/Array/Nested/Internal/Shaped.hs b/src/Data/Array/Nested/Shaped.hs
index 86dcee2..4bccbc4 100644
--- a/src/Data/Array/Nested/Internal/Shaped.hs
+++ b/src/Data/Array/Nested/Shaped.hs
@@ -16,7 +16,7 @@
{-# LANGUAGE ViewPatterns #-}
{-# OPTIONS_GHC -fplugin GHC.TypeLits.Normalise #-}
{-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-}
-module Data.Array.Nested.Internal.Shaped where
+module Data.Array.Nested.Shaped where
import Prelude hiding (mappend, mconcat)
@@ -40,12 +40,12 @@ import GHC.TypeLits
import Data.Array.Mixed.Lemmas
import Data.Array.Mixed.Permutation
-import Data.Array.Nested.Mixed.Shape
import Data.Array.Mixed.Types
-import Data.Array.Mixed.XArray (XArray)
-import Data.Array.Mixed.XArray qualified as X
+import Data.Array.XArray (XArray)
+import Data.Array.XArray qualified as X
import Data.Array.Nested.Internal.Lemmas
-import Data.Array.Nested.Internal.Mixed
+import Data.Array.Nested.Mixed
+import Data.Array.Nested.Mixed.Shape
import Data.Array.Nested.Shaped.Shape
import Data.Array.Strided.Arith
diff --git a/src/Data/Array/Mixed/XArray.hs b/src/Data/Array/XArray.hs
index 3e7a498..d8d564e 100644
--- a/src/Data/Array/Mixed/XArray.hs
+++ b/src/Data/Array/XArray.hs
@@ -11,7 +11,7 @@
{-# LANGUAGE TypeOperators #-}
{-# OPTIONS_GHC -fplugin GHC.TypeLits.Normalise #-}
{-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-}
-module Data.Array.Mixed.XArray where
+module Data.Array.XArray where
import Control.DeepSeq (NFData)
import Data.Array.Internal qualified as OI
@@ -31,11 +31,11 @@ import Foreign.Storable (Storable)
import GHC.Generics (Generic)
import GHC.TypeLits
-import Data.Array.Mixed.Internal.Arith
+import Data.Array.Arith
import Data.Array.Mixed.Lemmas
import Data.Array.Mixed.Permutation
-import Data.Array.Nested.Mixed.Shape
import Data.Array.Mixed.Types
+import Data.Array.Nested.Mixed.Shape
type XArray :: [Maybe Nat] -> Type -> Type