aboutsummaryrefslogtreecommitdiff
path: root/src/Data/Array
diff options
context:
space:
mode:
authorTom Smeding <tom@tomsmeding.com>2024-12-11 15:23:18 +0100
committerTom Smeding <tom@tomsmeding.com>2024-12-11 15:23:18 +0100
commit9570a94d331facc8961be204d7a3010d33146f97 (patch)
tree2cfffa3dae21b50e349c40a76e5757a386a02273 /src/Data/Array
parent46e48ad854f4c5f47b1a4dbf4059bf59e0bea7df (diff)
Fix scastToMixed
The previous implementation failed when any of sh' was Unknown, which makes no sense.
Diffstat (limited to 'src/Data/Array')
-rw-r--r--src/Data/Array/Nested/Internal/Shaped.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Data/Array/Nested/Internal/Shaped.hs b/src/Data/Array/Nested/Internal/Shaped.hs
index 2a8c206..f8df5aa 100644
--- a/src/Data/Array/Nested/Internal/Shaped.hs
+++ b/src/Data/Array/Nested/Internal/Shaped.hs
@@ -488,8 +488,8 @@ stoMixed (Shaped arr) = arr
-- compatibility check.
scastToMixed :: forall sh sh' a. (Elt a, Rank sh ~ Rank sh')
=> IShX sh' -> Shaped sh a -> Mixed sh' a
-scastToMixed shx (Shaped arr) =
- case shxEqual shx (mshape arr) of
- Just Refl -> arr
- Nothing -> error $ "scastToMixed: Given shape (" ++ show shx ++ ") is not equal to " ++
- "the shape of the array (" ++ show (mshape arr) ++ ")"
+scastToMixed shx sarr@(Shaped arr)
+ | Refl <- lemAppNil @sh'
+ , Refl <- lemAppNil @(MapJust sh)
+ , Refl <- lemRankMapJust (sshape sarr)
+ = mcast (ssxFromShape (mshape arr)) shx (Proxy @'[]) arr