1 files changed, 19 insertions, 4 deletions
diff --git a/src/Data/Array/Nested/Ranked/Shape.hs b/src/Data/Array/Nested/Ranked/Shape.hs
index 50338d2..989d7d1 100644
--- a/src/Data/Array/Nested/Ranked/Shape.hs
+++ b/src/Data/Array/Nested/Ranked/Shape.hs
@@ -1,8 +1,6 @@
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveFoldable #-}
-{-# LANGUAGE DeriveFunctor #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE FlexibleInstances #-}
@@ -56,8 +54,6 @@ data ListR n i where
   (:::) :: forall n {i}. i -> ListR n i -> ListR (n + 1) i
 deriving instance Eq i => Eq (ListR n i)
 deriving instance Ord i => Ord (ListR n i)
-deriving instance Functor (ListR n)
-deriving instance Foldable (ListR n)
 infixr 3 :::
 
 #ifdef OXAR_DEFAULT_SHOW_INSTANCES
@@ -71,6 +67,21 @@ instance NFData i => NFData (ListR n i) where
   rnf ZR = ()
   rnf (x ::: l) = rnf x `seq` rnf l
 
+instance Functor (ListR n) where
+  {-# INLINE fmap #-}
+  fmap _ ZR = ZR
+  fmap f (x ::: xs) = f x ::: fmap f xs
+
+instance Foldable (ListR n) where
+  {-# INLINE foldMap #-}
+  foldMap _ ZR = mempty
+  foldMap f (x ::: xs) = f x <> foldMap f xs
+  {-# INLINE foldr #-}
+  foldr _ z ZR = z
+  foldr f z (x ::: xs) = f x (foldr f z xs)
+  null ZR = False
+  null _ = True
+
 data UnconsListRRes i n1 =
   forall n. (n + 1 ~ n1) => UnconsListRRes (ListR n i) i
 listrUncons :: ListR n1 i -> Maybe (UnconsListRRes i n1)
@@ -95,6 +106,7 @@ listrEqual (i ::: sh) (j ::: sh')
   = Just Refl
 listrEqual _ _ = Nothing
 
+{-# INLINE listrShow #-}
 listrShow :: forall n i. (i -> ShowS) -> ListR n i -> ShowS
 listrShow f l = showString "[" . go "" l . showString "]"
   where
@@ -145,6 +157,7 @@ listrZip ZR ZR = ZR
 listrZip (i ::: irest) (j ::: jrest) = (i, j) ::: listrZip irest jrest
 listrZip _ _ = error "listrZip: impossible pattern needlessly required"
 
+{-# INLINE listrZipWith #-}
 listrZipWith :: (i -> j -> k) -> ListR n i -> ListR n j -> ListR n k
 listrZipWith _ ZR ZR = ZR
 listrZipWith f (i ::: irest) (j ::: jrest) =
@@ -244,6 +257,7 @@ ixrAppend = coerce (listrAppend @_ @i)
 ixrZip :: IxR n i -> IxR n j -> IxR n (i, j)
 ixrZip (IxR l1) (IxR l2) = IxR $ listrZip l1 l2
 
+{-# INLINE ixrZipWith #-}
 ixrZipWith :: (i -> j -> k) -> IxR n i -> IxR n j -> IxR n k
 ixrZipWith f (IxR l1) (IxR l2) = IxR $ listrZipWith f l1 l2
 
@@ -328,6 +342,7 @@ shrAppend = coerce (listrAppend @_ @i)
 shrZip :: ShR n i -> ShR n j -> ShR n (i, j)
 shrZip (ShR l1) (ShR l2) = ShR $ listrZip l1 l2
 
+{-# INLINE shrZipWith #-}
 shrZipWith :: (i -> j -> k) -> ShR n i -> ShR n j -> ShR n k
 shrZipWith f (ShR l1) (ShR l2) = ShR $ listrZipWith f l1 l2