1 files changed, 8 insertions, 8 deletions
diff --git a/src/Data/Array/Nested/Ranked/Base.hs b/src/Data/Array/Nested/Ranked/Base.hs
index babc809..11a8ffb 100644
--- a/src/Data/Array/Nested/Ranked/Base.hs
+++ b/src/Data/Array/Nested/Ranked/Base.hs
@@ -97,8 +97,8 @@ instance Elt a => Elt (Ranked n a) where
 
   mscalar (Ranked x) = M_Ranked (M_Nest ZSX x)
 
-  mfromListOuter :: forall sh. NonEmpty (Mixed sh (Ranked n a)) -> Mixed (Nothing : sh) (Ranked n a)
-  mfromListOuter l = M_Ranked (mfromListOuter (coerce l))
+  mfromListOuterSN :: SNat m -> NonEmpty (Mixed sh (Ranked n a)) -> Mixed (Just m : sh) (Ranked n a)
+  mfromListOuterSN sn l = M_Ranked (mfromListOuterSN sn (coerce l))
 
   mtoListOuter :: forall m sh. Mixed (m : sh) (Ranked n a) -> [Mixed sh (Ranked n a)]
   mtoListOuter (M_Ranked arr) =
@@ -143,7 +143,7 @@ instance Elt a => Elt (Ranked n a) where
 
   mshapeTreeEq _ (sh1, t1) (sh2, t2) = sh1 == sh2 && mshapeTreeEq (Proxy @a) t1 t2
 
-  mshapeTreeEmpty _ (sh, t) = shrSize sh == 0 && mshapeTreeEmpty (Proxy @a) t
+  mshapeTreeIsEmpty _ (sh, t) = shrSize sh == 0 || mshapeTreeIsEmpty (Proxy @a) t
 
   mshowShapeTree _ (sh, t) = "(" ++ show sh ++ ", " ++ mshowShapeTree (Proxy @a) t ++ ")"
 
@@ -179,10 +179,10 @@ instance Elt a => Elt (Ranked n a) where
 
 instance (KnownNat n, KnownElt a) => KnownElt (Ranked n a) where
   memptyArrayUnsafe :: forall sh. IShX sh -> Mixed sh (Ranked n a)
-  memptyArrayUnsafe i
+  memptyArrayUnsafe sh
     | Dict <- lemKnownReplicate (SNat @n)
     = coerce @(Mixed sh (Mixed (Replicate n Nothing) a)) @(Mixed sh (Ranked n a)) $
-        memptyArrayUnsafe i
+        memptyArrayUnsafe sh
 
   mvecsUnsafeNew idx (Ranked arr)
     | Dict <- lemKnownReplicate (SNat @n)
@@ -210,15 +210,15 @@ instance (NumElt a, PrimElt a) => Num (Ranked n a) where
   negate = liftRanked1 negate
   abs = liftRanked1 abs
   signum = liftRanked1 signum
-  fromInteger = error "Data.Array.Nested(Ranked).fromInteger: No singletons available, use explicit rreplicateScal"
+  fromInteger = error "Data.Array.Nested(Ranked).fromInteger: No singletons available, use explicit rreplicatePrim"
 
 instance (FloatElt a, PrimElt a) => Fractional (Ranked n a) where
-  fromRational _ = error "Data.Array.Nested(Ranked).fromRational: No singletons available, use explicit rreplicateScal"
+  fromRational _ = error "Data.Array.Nested(Ranked).fromRational: No singletons available, use explicit rreplicatePrim"
   recip = liftRanked1 recip
   (/) = liftRanked2 (/)
 
 instance (FloatElt a, PrimElt a) => Floating (Ranked n a) where
-  pi = error "Data.Array.Nested(Ranked).pi: No singletons available, use explicit rreplicateScal"
+  pi = error "Data.Array.Nested(Ranked).pi: No singletons available, use explicit rreplicatePrim"
   exp = liftRanked1 exp
   log = liftRanked1 log
   sqrt = liftRanked1 sqrt