Tweak sized list type synonyms slightly

2 files changed, 12 insertions, 11 deletions

diff --git a/src/Data/Array/Nested/Mixed/ListX.hs b/src/Data/Array/Nested/Mixed/ListX.hs
index ae3c89f..048003f 100644
--- a/src/Data/Array/Nested/Mixed/ListX.hs
+++ b/src/Data/Array/Nested/Mixed/ListX.hs
@@ -48,6 +48,7 @@ type ListX :: [Maybe Nat] -> Type -> Type
 newtype ListX sh i = ListX [i]
   deriving (Eq, Ord, NFData, Foldable)
 
+{-# INLINE ZX #-}
 pattern ZX :: forall sh i. () => sh ~ '[] => ListX sh i
 pattern ZX <- (listxNull -> Just Refl)
   where ZX = ListX []
@@ -62,16 +63,16 @@ pattern (::%)
   :: forall {sh1} {i}.
      forall n sh. (n : sh ~ sh1)
   => i -> ListX sh i -> ListX sh1 i
-pattern i ::% l <- (listxUncons -> Just (UnconsListXRes l i))
+pattern i ::% l <- (listxUncons -> Just (UnconsListXRes i l))
   where !i ::% ListX !l = ListX (i : l)
 infixr 3 ::%
 
 data UnconsListXRes i sh1 =
-  forall n sh. (n : sh ~ sh1) => UnconsListXRes (ListX sh i) i
+  forall n sh. (n : sh ~ sh1) => UnconsListXRes i (ListX sh i)
 {-# INLINE listxUncons #-}
 listxUncons :: forall sh1 i. ListX sh1 i -> Maybe (UnconsListXRes i sh1)
 listxUncons (ListX (i : l)) = gcastWith (unsafeCoerceRefl :: Head sh1 ': Tail sh1 :~: sh1) $
-                              Just (UnconsListXRes (ListX @(Tail sh1) l) i)
+                              Just (UnconsListXRes i (ListX @(Tail sh1) l))
 listxUncons (ListX []) = Nothing
 
 {-# COMPLETE ZX, (::%) #-}
@@ -123,7 +124,7 @@ instance Functor (ListX l) where
     let fmap' [] = []
         fmap' (x : xs) = let y = f x
                              rest = fmap' xs
-                         in y `seq` rest `seq` y : rest
+                         in y `seq` rest `seq` (y : rest)
     in ListX $ fmap' l
 
 -- | Very untyped: not even length is checked (at runtime).
diff --git a/src/Data/Array/Nested/Mixed/Shape.hs b/src/Data/Array/Nested/Mixed/Shape.hs
index 54a945b..25cecb5 100644
--- a/src/Data/Array/Nested/Mixed/Shape.hs
+++ b/src/Data/Array/Nested/Mixed/Shape.hs
@@ -107,8 +107,8 @@ pattern (:.%)
   :: forall {sh1} {i}.
      forall n sh. (n : sh ~ sh1)
   => i -> IxX sh i -> IxX sh1 i
-pattern i :.% sh <- IxX (i ::% (IxX -> sh))
-  where i :.% IxX sh = IxX (i ::% sh)
+pattern i :.% l <- IxX (i ::% (IxX -> l))
+  where i :.% IxX l = IxX (i ::% l)
 infixr 3 :.%
 
 {-# COMPLETE ZIX, (:.%) #-}
@@ -305,10 +305,10 @@ instance NFData i => NFData (ListH sh i) where
   rnf (SNat `ConsKnown` l) = rnf l
 
 data UnconsListHRes i sh1 =
-  forall n sh. (n : sh ~ sh1) => UnconsListHRes (ListH sh i) (SMayNat i n)
+  forall n sh. (n : sh ~ sh1) => UnconsListHRes (SMayNat i n) (ListH sh i)
 listhUncons :: ListH sh1 i -> Maybe (UnconsListHRes i sh1)
-listhUncons (i `ConsUnknown` shl') = Just (UnconsListHRes shl' (SUnknown i))
-listhUncons (i `ConsKnown` shl') = Just (UnconsListHRes shl' (SKnown i))
+listhUncons (i `ConsUnknown` shl') = Just (UnconsListHRes (SUnknown i) shl')
+listhUncons (i `ConsKnown` shl') = Just (UnconsListHRes (SKnown i) shl')
 listhUncons ZH = Nothing
 
 -- | This checks only whether the types are equal; if the elements of the list
@@ -422,7 +422,7 @@ pattern (:$%)
   :: forall {sh1} {i}.
      forall n sh. (n : sh ~ sh1)
   => SMayNat i n -> ShX sh i -> ShX sh1 i
-pattern i :$% shl <- ShX (listhUncons -> Just (UnconsListHRes (ShX -> shl) i))
+pattern i :$% shl <- ShX (listhUncons -> Just (UnconsListHRes i (ShX -> shl)))
   where i :$% ShX shl = case i of; SUnknown x -> ShX (x `ConsUnknown` shl); SKnown x -> ShX (x `ConsKnown` shl)
 infixr 3 :$%
 
@@ -605,7 +605,7 @@ pattern (:!%)
   :: forall {sh1}.
      forall n sh. (n : sh ~ sh1)
   => SMayNat () n -> StaticShX sh -> StaticShX sh1
-pattern i :!% shl <- StaticShX (listhUncons -> Just (UnconsListHRes (StaticShX -> shl) i))
+pattern i :!% shl <- StaticShX (listhUncons -> Just (UnconsListHRes i (StaticShX -> shl)))
   where i :!% StaticShX shl = case i of; SUnknown () -> StaticShX (() `ConsUnknown` shl); SKnown x -> StaticShX (x `ConsKnown` shl)
 
 infixr 3 :!%