update fuse

Author: 9il

source/mir/ndslice/dynamic.d

@@ -489,9 +489,7 @@ See_also: $(LREF swapped), $(LREF everted)
 template transposed(Dimensions...)
     if (Dimensions.length)
 {
-    static if (!allSatisfy!(isSize_t, Dimensions))
-        alias transposed = .transposed!(staticMap!(toSize_t, Dimensions));
-    else
+    static if (allSatisfy!(isSize_t, Dimensions))
     ///
     @optmath auto transposed(Iterator, size_t N, SliceKind kind)(Slice!(Iterator, N, kind) _slice)
     {
@@ -531,6 +529,8 @@ template transposed(Dimensions...)
             mixin (_transposedCode);
         }
     }
+    else
+        alias transposed = .transposed!(staticMap!(toSize_t, Dimensions));
 }
 
 ///ditto
@@ -662,9 +662,7 @@ Returns:
 template reversed(Dimensions...)
     if (Dimensions.length)
 {
-    static if (!allSatisfy!(isSize_t, Dimensions))
-        alias reversed = .reversed!(staticMap!(toSize_t, Dimensions));
-    else
+    static if (allSatisfy!(isSize_t, Dimensions))
     ///
     @optmath auto reversed(Iterator, size_t N, SliceKind kind)(Slice!(Iterator, N, kind) _slice) @trusted
     {
@@ -693,6 +691,8 @@ template reversed(Dimensions...)
         }
         return slice;
     }
+    else
+        alias reversed = .reversed!(staticMap!(toSize_t, Dimensions));
 }
 
 ///ditto
@@ -813,12 +813,10 @@ Returns:
 template strided(Dimensions...)
     if (Dimensions.length)
 {
-    static if (!allSatisfy!(isSize_t, Dimensions))
-        alias strided = .strided!(staticMap!(toSize_t, Dimensions));
-    else
+    static if (allSatisfy!(isSize_t, Dimensions))
     /++
     Params:
-        slice = input slice
+        _slice = input slice
         factors = list of step extension factors
     +/
     @optmath auto strided(Iterator, size_t N, SliceKind kind)(Slice!(Iterator, N, kind) _slice, Repeat!(Dimensions.length, ptrdiff_t) factors)
@@ -849,6 +847,8 @@ template strided(Dimensions...)
         }
         return slice;
     }
+    else
+        alias strided = .strided!(staticMap!(toSize_t, Dimensions));
 }
 
 ///ditto

source/mir/ndslice/fuse.d

@@ -28,24 +28,37 @@ import mir.math.common: optmath;
 @optmath:
 
 /++
-Fuses ndrange `r` into GC-allocated (`fuse`) or RC-allocated (`rcfuse`) ndslice. Can be used to join rows or columns into a matrix.
+Fuses ndrange `r` into GC-allocated ($(LREF fuse)) or RC-allocated ($(LREF rcfuse)) ndslice.
+Can be used to join rows or columns into a matrix.
 
 Params:
     Dimensions = (optional) indexes of dimensions to be brought to the first position
 Returns:
     ndslice
 +/
-///
-alias fuse(Dimensions...) = fuseImpl!(false, Dimensions);
-///
-alias rcfuse(Dimensions...) = fuseImpl!(true, Dimensions);
+alias fuse(Dimensions...) = fuseImpl!(false, void, Dimensions);
+/// ditto
+alias rcfuse(Dimensions...) = fuseImpl!(true, void, Dimensions);
+
+/++
+Fuses ndrange `r` into GC-allocated ($(LREF fuseAs)) or RC-allocated ($(LREF rcfuseAs)) ndslice.
+Can be used to join rows or columns into a matrix.
+
+Params:
+    T = output type of ndslice elements
+    Dimensions = (optional) indexes of dimensions to be brought to the first position
+Returns:
+    ndslice
++/
+alias fuseAs(T, Dimensions...) = fuseImpl!(false, T, Dimensions);
 /// ditto
-template fuseImpl(bool RC, Dimensions...)
+alias rcfuseAs(T, Dimensions...) = fuseImpl!(true, T, Dimensions);
+
+///
+template fuseImpl(bool RC, T_, Dimensions...)
 {
     import mir.ndslice.internal: isSize_t, toSize_t;
-    static if (!allSatisfy!(isSize_t, Dimensions))
-        alias fuseImpl = .fuseImpl!(RC, staticMap!(toSize_t, Dimensions));
-    else
+    static if (allSatisfy!(isSize_t, Dimensions))
     /++
     Params:
         r = parallelotope (ndrange) with length/shape and input range primitives.
@@ -57,7 +70,10 @@ template fuseImpl(bool RC, Dimensions...)
         import mir.algorithm.iteration: each;
         import mir.ndslice.allocation;
         auto shape = fuseShape(r);
-        alias T = FuseElementType!NDRange;
+        static if (is(T_ == void))
+            alias T = FuseElementType!NDRange;
+        else
+            alias T = T_;
         alias UT = Unqual!T;
         static if (RC)
         {
@@ -137,6 +153,8 @@ template fuseImpl(bool RC, Dimensions...)
             return *(() @trusted => cast(R*)&ret)();
         }
     }
+    else
+        alias fuseImpl = .fuseImpl!(RC, T_, staticMap!(toSize_t, Dimensions));
 }
 
 ///

source/mir/ndslice/package.d

@@ -188,6 +188,9 @@ $(TR $(TDNW $(SUBMODULE fuse) $(BR)
     ))
      $(TD
         $(SUBREF fuse, fuse)
+        $(SUBREF fuse, fuseAs)
+        $(SUBREF fuse, rcfuse)
+        $(SUBREF fuse, rcfuseAs)
         $(SUBREF fuse, fuseCells)
     )
 )