From 6b5139c0a8d0c4e76c349f2847cc5629137f4536 Mon Sep 17 00:00:00 2001
From: Tom Smeding <tom@tomsmeding.com>
Date: Sat, 18 May 2024 14:05:09 +0200
Subject: Finish singletons refactor?

---
 src/Data/Array/Nested.hs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/Data/Array/Nested.hs')

diff --git a/src/Data/Array/Nested.hs b/src/Data/Array/Nested.hs
index 4b455da..45a03d4 100644
--- a/src/Data/Array/Nested.hs
+++ b/src/Data/Array/Nested.hs
@@ -3,9 +3,9 @@
 module Data.Array.Nested (
   -- * Ranked arrays
   Ranked,
-  ListR(ZR, (:::)), knownListR,
-  IxR(.., ZIR, (:.:)), IIxR, knownIxR,
-  ShR(.., ZSR, (:$:)), knownShR,
+  ListR(ZR, (:::)),
+  IxR(.., ZIR, (:.:)), IIxR,
+  ShR(.., ZSR, (:$:)),
   rshape, rindex, rindexPartial, rgenerate, rsumOuter1,
   rtranspose, rappend, rscalar, rfromVector, rtoVector, runScalar,
   rconstant, rfromList, rfromList1, rtoList, rtoList1,
@@ -19,7 +19,7 @@ module Data.Array.Nested (
   Shaped,
   ListS(ZS, (::$)),
   IxS(.., ZIS, (:.$)), IIxS,
-  ShS(..), KnownShape(..),
+  ShS(.., ZSS, (:$$)), KnownShS(..),
   sshape, sindex, sindexPartial, sgenerate, ssumOuter1,
   stranspose, sappend, sscalar, sfromVector, stoVector, sunScalar,
   sconstant, sfromList, sfromList1, stoList, stoList1,
@@ -32,7 +32,7 @@ module Data.Array.Nested (
   -- * Mixed arrays
   Mixed,
   IxX(..), IIxX,
-  KnownShapeX(..), StaticShX(..),
+  KnownShX(..), StaticShX(..),
   mgenerate, mtranspose, mappend, mfromVector, mtoVector, munScalar,
   mconstant, mfromList, mtoList, mslice, mrev1, mreshape,
   -- ** Conversions
@@ -46,9 +46,9 @@ module Data.Array.Nested (
   -- * Further utilities / re-exports
   type (++),
   Storable,
+  SNat, pattern SNat,
   HList,
   Permutation,
-  makeNatList,
 ) where
 
 import Prelude hiding (mappend)
@@ -56,3 +56,4 @@ import Prelude hiding (mappend)
 import Data.Array.Mixed
 import Data.Array.Nested.Internal
 import Foreign.Storable
+import GHC.TypeLits
-- 
cgit v1.2.3-70-g09d2