From f2cec69969a68e8feed3dceacef5186b1debdda5 Mon Sep 17 00:00:00 2001
From: Mikolaj Konarski <mikolaj.konarski@funktory.com>
Date: Tue, 16 Dec 2025 09:51:51 +0100
Subject: Make ShR a newtype over ShX

---
 src/Data/Array/Nested/Mixed/Shape.hs | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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

diff --git a/src/Data/Array/Nested/Mixed/Shape.hs b/src/Data/Array/Nested/Mixed/Shape.hs
index 7c79f8b..5ffd40c 100644
--- a/src/Data/Array/Nested/Mixed/Shape.hs
+++ b/src/Data/Array/Nested/Mixed/Shape.hs
@@ -549,11 +549,11 @@ shxFromList topssh topl = go topssh topl
 
 {-# INLINEABLE shxToList #-}
 shxToList :: IShX sh -> [Int]
-shxToList list = build (\(cons :: i -> is -> is) (nil :: is) ->
+shxToList sh0 = build (\(cons :: i -> is -> is) (nil :: is) ->
   let go :: IShX sh -> is
       go ZSX = nil
       go (smn :$% sh) = fromSMayNat' smn `cons` go sh
-  in go list)
+  in go sh0)
 
 -- If it ever matters for performance, this is unsafeCoercible.
 shxFromSSX :: StaticShX (MapJust sh) -> ShX (MapJust sh) i
@@ -578,6 +578,10 @@ shxHead (ShX list) = listhHead list
 shxTail :: ShX (n : sh) i -> ShX sh i
 shxTail (ShX list) = ShX (listhTail list)
 
+shxTakeSSX :: forall sh sh' i proxy. proxy sh' -> StaticShX sh -> ShX (sh ++ sh') i -> ShX sh i
+shxTakeSSX _ ZKX _ = ZSX
+shxTakeSSX p (_ :!% ssh1) (n :$% sh) = n :$% shxTakeSSX p ssh1 sh
+
 shxDropSSX :: forall sh sh' i. StaticShX sh -> ShX (sh ++ sh') i -> ShX sh' i
 shxDropSSX = coerce (listhDrop @i @())
 
@@ -594,10 +598,6 @@ shxInit = coerce (listhInit @i)
 shxLast :: forall n sh i. ShX (n : sh) i -> SMayNat i (Last (n : sh))
 shxLast = coerce (listhLast @i)
 
-shxTakeSSX :: forall sh sh' i proxy. proxy sh' -> StaticShX sh -> ShX (sh ++ sh') i -> ShX sh i
-shxTakeSSX _ ZKX _ = ZSX
-shxTakeSSX p (_ :!% ssh1) (n :$% sh) = n :$% shxTakeSSX p ssh1 sh
-
 {-# INLINE shxZipWith #-}
 shxZipWith :: (forall n. SMayNat i n -> SMayNat j n -> SMayNat k n)
            -> ShX sh i -> ShX sh j -> ShX sh k
@@ -690,14 +690,13 @@ ssxEqType :: StaticShX sh -> StaticShX sh' -> Maybe (sh :~: sh')
 ssxEqType = testEquality
 
 ssxAppend :: StaticShX sh -> StaticShX sh' -> StaticShX (sh ++ sh')
-ssxAppend ZKX sh' = sh'
-ssxAppend (n :!% sh) sh' = n :!% ssxAppend sh sh'
+ssxAppend = coerce (listhAppend @_ @())
 
 ssxHead :: StaticShX (n : sh) -> SMayNat () n
 ssxHead (StaticShX list) = listhHead list
 
 ssxTail :: StaticShX (n : sh) -> StaticShX sh
-ssxTail (_ :!% ssh) = ssh
+ssxTail (StaticShX list) = StaticShX (listhTail list)
 
 ssxTakeIx :: forall sh sh' i. Proxy sh' -> IxX sh i -> StaticShX (sh ++ sh') -> StaticShX sh
 ssxTakeIx _ (IxX ZX) _ = ZKX
@@ -795,8 +794,8 @@ instance KnownShX sh => IsList (IxX sh i) where
   toList = Foldable.toList
 
 -- | Untyped: length and known dimensions are checked (at runtime).
-instance KnownShX sh => IsList (ShX sh Int) where
-  type Item (ShX sh Int) = Int
+instance KnownShX sh => IsList (IShX sh) where
+  type Item (IShX sh) = Int
   fromList = shxFromList (knownShX @sh)
   toList = shxToList
 
-- 
cgit v1.2.3-70-g09d2