From 2ca90987058d14c79cd983ab14ee57949bae2871 Mon Sep 17 00:00:00 2001
From: Tom Smeding <tom@tomsmeding.com>
Date: Mon, 17 Jun 2024 12:04:09 +0200
Subject: Generalise some of the lifting functions to type-changing

---
 src/Data/Array/Nested/Internal/Mixed.hs  | 12 ++++++------
 src/Data/Array/Nested/Internal/Ranked.hs | 12 ++++++------
 src/Data/Array/Nested/Internal/Shaped.hs | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/Data/Array/Nested/Internal')

diff --git a/src/Data/Array/Nested/Internal/Mixed.hs b/src/Data/Array/Nested/Internal/Mixed.hs
index ddc075c..647ea82 100644
--- a/src/Data/Array/Nested/Internal/Mixed.hs
+++ b/src/Data/Array/Nested/Internal/Mixed.hs
@@ -871,13 +871,13 @@ mfromXArrayPrimP ssh arr = M_Primitive (X.shape ssh arr) arr
 mfromXArrayPrim :: PrimElt a => StaticShX sh -> XArray sh a -> Mixed sh a
 mfromXArrayPrim = (fromPrimitive .) . mfromXArrayPrimP
 
-mliftPrim :: PrimElt a
-          => (a -> a)
-          -> Mixed sh a -> Mixed sh a
+mliftPrim :: (PrimElt a, PrimElt b)
+          => (a -> b)
+          -> Mixed sh a -> Mixed sh b
 mliftPrim f (toPrimitive -> M_Primitive sh (X.XArray arr)) = fromPrimitive $ M_Primitive sh (X.XArray (S.mapA f arr))
 
-mliftPrim2 :: PrimElt a
-           => (a -> a -> a)
-           -> Mixed sh a -> Mixed sh a -> Mixed sh a
+mliftPrim2 :: (PrimElt a, PrimElt b, PrimElt c)
+           => (a -> b -> c)
+           -> Mixed sh a -> Mixed sh b -> Mixed sh c
 mliftPrim2 f (toPrimitive -> M_Primitive sh (X.XArray arr1)) (toPrimitive -> M_Primitive _ (X.XArray arr2)) =
   fromPrimitive $ M_Primitive sh (X.XArray (S.zipWithA f arr1 arr2))
diff --git a/src/Data/Array/Nested/Internal/Ranked.hs b/src/Data/Array/Nested/Internal/Ranked.hs
index e59ac0c..bd37e7a 100644
--- a/src/Data/Array/Nested/Internal/Ranked.hs
+++ b/src/Data/Array/Nested/Internal/Ranked.hs
@@ -180,14 +180,14 @@ instance (KnownNat n, KnownElt a) => KnownElt (Ranked n a) where
     = MV_Ranked <$> mvecsNewEmpty (Proxy @(Mixed (Replicate n Nothing) a))
 
 
-arithPromoteRanked :: forall n a. PrimElt a
-                   => (forall sh. Mixed sh a -> Mixed sh a)
-                   -> Ranked n a -> Ranked n a
+arithPromoteRanked :: forall n a b.
+                      (forall sh. Mixed sh a -> Mixed sh b)
+                   -> Ranked n a -> Ranked n b
 arithPromoteRanked = coerce
 
-arithPromoteRanked2 :: forall n a. PrimElt a
-                    => (forall sh. Mixed sh a -> Mixed sh a -> Mixed sh a)
-                    -> Ranked n a -> Ranked n a -> Ranked n a
+arithPromoteRanked2 :: forall n a b c.
+                       (forall sh. Mixed sh a -> Mixed sh b -> Mixed sh c)
+                    -> Ranked n a -> Ranked n b -> Ranked n c
 arithPromoteRanked2 = coerce
 
 instance (NumElt a, PrimElt a, Num a) => Num (Ranked n a) where
diff --git a/src/Data/Array/Nested/Internal/Shaped.hs b/src/Data/Array/Nested/Internal/Shaped.hs
index 2c24e6d..f50ed28 100644
--- a/src/Data/Array/Nested/Internal/Shaped.hs
+++ b/src/Data/Array/Nested/Internal/Shaped.hs
@@ -178,14 +178,14 @@ instance (KnownShS sh, KnownElt a) => KnownElt (Shaped sh a) where
     = MV_Shaped <$> mvecsNewEmpty (Proxy @(Mixed (MapJust sh) a))
 
 
-arithPromoteShaped :: forall sh a. PrimElt a
-                   => (forall shx. Mixed shx a -> Mixed shx a)
-                   -> Shaped sh a -> Shaped sh a
+arithPromoteShaped :: forall sh a b.
+                      (forall shx. Mixed shx a -> Mixed shx b)
+                   -> Shaped sh a -> Shaped sh b
 arithPromoteShaped = coerce
 
-arithPromoteShaped2 :: forall sh a. PrimElt a
-                    => (forall shx. Mixed shx a -> Mixed shx a -> Mixed shx a)
-                    -> Shaped sh a -> Shaped sh a -> Shaped sh a
+arithPromoteShaped2 :: forall sh a b c.
+                       (forall shx. Mixed shx a -> Mixed shx b -> Mixed shx c)
+                    -> Shaped sh a -> Shaped sh b -> Shaped sh c
 arithPromoteShaped2 = coerce
 
 instance (NumElt a, PrimElt a, Num a) => Num (Shaped sh a) where
-- 
cgit v1.2.3-70-g09d2