summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ox-arrays.cabal4
-rw-r--r--src/Data/Array/Mixed/Lemmas.hs4
-rw-r--r--src/Data/Array/Nested.hs4
-rw-r--r--src/Data/Array/Nested/Convert.hs2
-rw-r--r--src/Data/Array/Nested/Internal/Lemmas.hs4
-rw-r--r--src/Data/Array/Nested/Mixed.hs4
-rw-r--r--src/Data/Array/Nested/Mixed/Shape.hs2
-rw-r--r--src/Data/Array/Nested/Permutation.hs (renamed from src/Data/Array/Mixed/Permutation.hs)4
-rw-r--r--src/Data/Array/Nested/Ranked.hs4
-rw-r--r--src/Data/Array/Nested/Ranked/Base.hs2
-rw-r--r--src/Data/Array/Nested/Ranked/Shape.hs2
-rw-r--r--src/Data/Array/Nested/Shaped.hs4
-rw-r--r--src/Data/Array/Nested/Shaped/Base.hs2
-rw-r--r--src/Data/Array/Nested/Shaped/Shape.hs4
-rw-r--r--src/Data/Array/Nested/Types.hs (renamed from src/Data/Array/Mixed/Types.hs)2
-rw-r--r--src/Data/Array/XArray.hs4
-rw-r--r--test/Gen.hs4
-rw-r--r--test/Tests/C.hs2
-rw-r--r--test/Tests/Permutation.hs2
-rw-r--r--test/Util.hs2
20 files changed, 31 insertions, 31 deletions
diff --git a/ox-arrays.cabal b/ox-arrays.cabal
index f3c78d9..d9a345b 100644
--- a/ox-arrays.cabal
+++ b/ox-arrays.cabal
@@ -56,18 +56,18 @@ library
Data.Array.Nested
Data.Array.Mixed.Lemmas
- Data.Array.Mixed.Permutation
- Data.Array.Mixed.Types
Data.Array.Nested.Internal.Lemmas
Data.Array.Nested.Convert
Data.Array.Nested.Mixed
Data.Array.Nested.Mixed.Shape
+ Data.Array.Nested.Permutation
Data.Array.Nested.Ranked
Data.Array.Nested.Ranked.Base
Data.Array.Nested.Ranked.Shape
Data.Array.Nested.Shaped
Data.Array.Nested.Shaped.Base
Data.Array.Nested.Shaped.Shape
+ Data.Array.Nested.Types
Data.Array.Strided.Orthotope
Data.Array.XArray
Data.Bag
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
diff --git a/test/Gen.hs b/test/Gen.hs
index 50c671f..281c620 100644
--- a/test/Gen.hs
+++ b/test/Gen.hs
@@ -20,8 +20,8 @@ import Foreign
import GHC.TypeLits
import GHC.TypeNats qualified as TN
-import Data.Array.Mixed.Permutation
-import Data.Array.Mixed.Types
+import Data.Array.Nested.Permutation
+import Data.Array.Nested.Types
import Data.Array.Nested
import Data.Array.Nested.Ranked.Shape
diff --git a/test/Tests/C.hs b/test/Tests/C.hs
index 72bf8f6..3b78bc0 100644
--- a/test/Tests/C.hs
+++ b/test/Tests/C.hs
@@ -18,7 +18,7 @@ import Data.Type.Equality
import Foreign
import GHC.TypeLits
-import Data.Array.Mixed.Types (fromSNat')
+import Data.Array.Nested.Types (fromSNat')
import Data.Array.Nested
import Data.Array.Nested.Ranked.Shape
diff --git a/test/Tests/Permutation.hs b/test/Tests/Permutation.hs
index 1e7ad13..98a6da5 100644
--- a/test/Tests/Permutation.hs
+++ b/test/Tests/Permutation.hs
@@ -6,7 +6,7 @@ module Tests.Permutation where
import Data.Type.Equality
-import Data.Array.Mixed.Permutation
+import Data.Array.Nested.Permutation
import Hedgehog
import Hedgehog.Gen qualified as Gen
diff --git a/test/Util.hs b/test/Util.hs
index 34cf8ab..8a5ba72 100644
--- a/test/Util.hs
+++ b/test/Util.hs
@@ -15,7 +15,7 @@ import GHC.TypeLits
import Hedgehog
import Hedgehog.Internal.Property (failDiff)
-import Data.Array.Mixed.Types (fromSNat')
+import Data.Array.Nested.Types (fromSNat')
-- Returns highest value that satisfies the predicate, or `lo` if none does
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-10-30 22:01:31 +0100