diff options
| -rw-r--r-- | src/Data/Array/Nested.hs | 12 | ||||
| -rw-r--r-- | src/Data/Array/Nested/Internal.hs | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/Data/Array/Nested.hs b/src/Data/Array/Nested.hs index 9e4c0e7..22f65a6 100644 --- a/src/Data/Array/Nested.hs +++ b/src/Data/Array/Nested.hs @@ -4,7 +4,7 @@ module Data.Array.Nested ( Ranked, IxR(..), rshape, rindex, rindexPartial, rgenerate, rsumOuter1, - rtranspose, rscalar, + rtranspose, rappend, rscalar, -- ** Lifting orthotope operations to 'Ranked' arrays rlift, @@ -13,7 +13,7 @@ module Data.Array.Nested ( IxS(..), KnownShape(..), SShape(..), sshape, sindex, sindexPartial, sgenerate, ssumOuter1, - stranspose, sscalar, + stranspose, sappend, sscalar, -- ** Lifting orthotope operations to 'Shaped' arrays slift, @@ -21,10 +21,10 @@ module Data.Array.Nested ( Mixed, IxX(..), KnownShapeX(..), StaticShapeX(..), - mgenerate, mtranspose, + mgenerate, mtranspose, mappend, -- * Array elements - Elt(mshape, mindex, mindexPartial, mscalar, mlift), + Elt(mshape, mindex, mindexPartial, mscalar, mlift, mlift2), Primitive(..), -- * Inductive natural numbers @@ -32,8 +32,12 @@ module Data.Array.Nested ( -- * Further utilities / re-exports type (++), + Storable, ) where +import Prelude hiding (mappend) + import Data.Array.Mixed import Data.Array.Nested.Internal import Data.INat +import Foreign.Storable diff --git a/src/Data/Array/Nested/Internal.hs b/src/Data/Array/Nested/Internal.hs index 1079e99..d9b2c86 100644 --- a/src/Data/Array/Nested/Internal.hs +++ b/src/Data/Array/Nested/Internal.hs @@ -93,7 +93,7 @@ newtype Primitive a = Primitive a -- always in struct-of-arrays format. -- -- Built on top of 'XArray' which is built on top of @orthotope@, meaning that --- dimension permutations (e.g. 'transpose') are typically free. +-- dimension permutations (e.g. 'mtranspose') are typically free. -- -- Many of the methods for working on 'Mixed' arrays come from the 'Elt' type -- class. |