diff options
| author | Tom Smeding <tom@tomsmeding.com> | 2025-05-15 21:40:50 +0200 |
|---|---|---|
| committer | Tom Smeding <tom@tomsmeding.com> | 2025-05-15 21:41:51 +0200 |
| commit | 6f82510ddde60b76e7c81eae2da7d947312179e5 (patch) | |
| tree | 823bdd206b6826b279146f3acd1a9e851b31592e | |
| parent | 3c8f13c8310de646b15c6f2745cfe190db7610db (diff) | |
Move Data.Array.Arith to Data.Array.Strided.Orthotope
| -rw-r--r-- | ox-arrays.cabal | 2 | ||||
| -rw-r--r-- | src/Data/Array/Nested/Mixed.hs | 2 | ||||
| -rw-r--r-- | src/Data/Array/Strided/Orthotope.hs (renamed from src/Data/Array/Arith.hs) | 4 | ||||
| -rw-r--r-- | src/Data/Array/XArray.hs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ox-arrays.cabal b/ox-arrays.cabal index 9cfc7dd..0cc2953 100644 --- a/ox-arrays.cabal +++ b/ox-arrays.cabal @@ -47,7 +47,6 @@ library -- put this module on top so ghci considers it the "main" module Data.Array.Nested - Data.Array.Arith Data.Array.Mixed.Lemmas Data.Array.Mixed.Permutation Data.Array.Mixed.Types @@ -59,6 +58,7 @@ library Data.Array.Nested.Mixed.Shape Data.Array.Nested.Ranked.Shape Data.Array.Nested.Shaped.Shape + Data.Array.Strided.Orthotope Data.Array.XArray Data.Bag diff --git a/src/Data/Array/Nested/Mixed.hs b/src/Data/Array/Nested/Mixed.hs index ec19c21..0a7eaba 100644 --- a/src/Data/Array/Nested/Mixed.hs +++ b/src/Data/Array/Nested/Mixed.hs @@ -42,13 +42,13 @@ import GHC.Generics (Generic) import GHC.TypeLits import Unsafe.Coerce (unsafeCoerce) -import Data.Array.Arith import Data.Array.Mixed.Lemmas import Data.Array.Mixed.Permutation import Data.Array.Mixed.Types import Data.Array.XArray (XArray(..)) import Data.Array.XArray qualified as X import Data.Array.Nested.Mixed.Shape +import Data.Array.Strided.Orthotope import Data.Bag diff --git a/src/Data/Array/Arith.hs b/src/Data/Array/Strided/Orthotope.hs index 1eae737..5c38d14 100644 --- a/src/Data/Array/Arith.hs +++ b/src/Data/Array/Strided/Orthotope.hs @@ -1,6 +1,6 @@ {-# LANGUAGE ImportQualifiedPost #-} -module Data.Array.Arith ( - module Data.Array.Arith, +module Data.Array.Strided.Orthotope ( + module Data.Array.Strided.Orthotope, module Data.Array.Strided.Arith, ) where diff --git a/src/Data/Array/XArray.hs b/src/Data/Array/XArray.hs index d8d564e..7f78420 100644 --- a/src/Data/Array/XArray.hs +++ b/src/Data/Array/XArray.hs @@ -31,11 +31,11 @@ import Foreign.Storable (Storable) import GHC.Generics (Generic) import GHC.TypeLits -import Data.Array.Arith import Data.Array.Mixed.Lemmas import Data.Array.Mixed.Permutation import Data.Array.Mixed.Types import Data.Array.Nested.Mixed.Shape +import Data.Array.Strided.Orthotope type XArray :: [Maybe Nat] -> Type -> Type |