Merge pull request #4823 from 9il/templatebloat

reduce ndslice template bloat

Author: andralex

std/experimental/ndslice/internal.d

@@ -334,42 +334,6 @@ enum indexError(size_t pos, size_t N) =
     ~ " from the range [0 .." ~ N.stringof ~ ")"
     ~ " must be less than corresponding length.";
 
-enum indexStrideCode = q{
-    static if (_indexes.length)
-    {
-        size_t stride = _strides[0] * _indexes[0];
-        assert(_indexes[0] < _lengths[0], indexError!(0, N));
-        foreach (i; Iota!(1, N)) //static
-        {
-            assert(_indexes[i] < _lengths[i], indexError!(i, N));
-            stride += _strides[i] * _indexes[i];
-        }
-        return stride;
-    }
-    else
-    {
-        return 0;
-    }
-};
-
-enum mathIndexStrideCode = q{
-    static if (_indexes.length)
-    {
-        size_t stride = _strides[0] * _indexes[N - 1];
-        assert(_indexes[N - 1] < _lengths[0], indexError!(N - 1, N));
-        foreach_reverse (i; Iota!(0, N - 1)) //static
-        {
-            assert(_indexes[i] < _lengths[N - 1 - i], indexError!(i, N));
-            stride += _strides[N - 1 - i] * _indexes[i];
-        }
-        return stride;
-    }
-    else
-    {
-        return 0;
-    }
-};
-
 enum string tailErrorMessage(
     string fun = __FUNCTION__,
     string pfun = __PRETTY_FUNCTION__) =
@@ -513,6 +477,8 @@ private bool isValidPartialPermutationImpl(size_t N)(in size_t[] perm, ref int[N
     return true;
 }
 
+enum toSize_t(size_t i) = i;
+enum isSize_t(alias i) = is(typeof(i) == size_t);
 enum isIndex(I) = is(I : size_t);
 enum is_Slice(S) = is(S : _Slice);
 

std/experimental/ndslice/iteration.d

@@ -329,7 +329,7 @@ Returns:
     n-dimensional slice of the same type
 See_also: $(LREF swapped), $(LREF transposed)
 +/
-Slice!(N, Range) everted(size_t N, Range)(auto ref Slice!(N, Range) slice)
+Slice!(N, Range) everted(size_t N, Range)(Slice!(N, Range) slice)
 {
     mixin _DefineRet;
     with (slice)
@@ -378,7 +378,7 @@ private enum _transposedCode = q{
     }
 };
 
-private size_t[N] completeTranspose(size_t N)(in size_t[] dimensions)
+private size_t[N] completeTranspose(size_t N)(size_t[] dimensions)
 {
     assert(dimensions.length <= N);
     size_t[N] ctr;
@@ -410,7 +410,10 @@ See_also: $(LREF swapped), $(LREF everted)
 template transposed(Dimensions...)
     if (Dimensions.length)
 {
-    @fmb Slice!(N, Range) transposed(size_t N, Range)(auto ref Slice!(N, Range) slice)
+    static if (!allSatisfy!(isSize_t, Dimensions))
+        alias transposed = .transposed!(staticMap!(toSize_t, Dimensions));
+    else
+    @fmb Slice!(N, Range) transposed(size_t N, Range)(Slice!(N, Range) slice)
     {
         mixin DimensionsCountCTError;
         foreach (i, dimension; Dimensions)
@@ -425,22 +428,7 @@ template transposed(Dimensions...)
 }
 
 ///ditto
-Slice!(N, Range) transposed(size_t N, Range)(auto ref Slice!(N, Range) slice, size_t dimension)
-in
-{
-    mixin (DimensionRTError);
-}
-body
-{
-    size_t[1] permutation = void;
-    permutation[0] = dimension;
-    immutable perm = completeTranspose!N(permutation);
-    assert(perm.isPermutation, __PRETTY_FUNCTION__  ~ ": internal error.");
-    mixin (_transposedCode);
-}
-
-///ditto
-Slice!(N, Range) transposed(size_t N, Range)(auto ref Slice!(N, Range) slice, in size_t[] dimensions...)
+Slice!(N, Range) transposed(size_t N, Range, size_t M)(Slice!(N, Range) slice, size_t[M] dimensions...)
 in
 {
     mixin (DimensionsCountRTError);
@@ -458,7 +446,7 @@ body
 }
 
 ///ditto
-Slice!(2, Range) transposed(Range)(auto ref Slice!(2, Range) slice)
+Slice!(2, Range) transposed(Range)(Slice!(2, Range) slice)
 {
     return .transposed!(1, 0)(slice);
 }
@@ -552,6 +540,9 @@ Returns:
 template reversed(Dimensions...)
     if (Dimensions.length)
 {
+    static if (!allSatisfy!(isSize_t, Dimensions))
+        alias reversed = .reversed!(staticMap!(toSize_t, Dimensions));
+    else
     @fmb auto reversed(size_t N, Range)(Slice!(N, Range) slice)
     {
         foreach (i, dimension; Dimensions)
@@ -564,28 +555,19 @@ template reversed(Dimensions...)
 }
 
 ///ditto
-Slice!(N, Range) reversed(size_t N, Range)(Slice!(N, Range) slice, size_t dimension)
-in
-{
-    mixin (DimensionRTError);
-}
-body
-{
-    mixin (_reversedCode);
-    return slice;
-}
-
-///ditto
-Slice!(N, Range) reversed(size_t N, Range)(Slice!(N, Range) slice, in size_t[] dimensions...)
+Slice!(N, Range) reversed(size_t N, Range, size_t M)(Slice!(N, Range) slice, size_t[M] dimensions...)
 in
 {
     foreach (dimension; dimensions)
         mixin (DimensionRTError);
 }
 body
 {
-    foreach (dimension; dimensions)
+    foreach (i; Iota!(0, M))
+    {
+        auto dimension = dimensions[i];
         mixin (_reversedCode);
+    }
     return slice;
 }
 
@@ -666,6 +648,9 @@ Returns:
 template strided(Dimensions...)
     if (Dimensions.length)
 {
+    static if (!allSatisfy!(isSize_t, Dimensions))
+        alias strided = .strided!(staticMap!(toSize_t, Dimensions));
+    else
     @fmb auto strided(size_t N, Range)(Slice!(N, Range) slice, Repeat!(Dimensions.length, size_t) factors)
     body
     {
@@ -892,6 +877,9 @@ Returns:
 template dropOne(Dimensions...)
     if (Dimensions.length)
 {
+    static if (!allSatisfy!(isSize_t, Dimensions))
+        alias dropOne = .dropOne!(staticMap!(toSize_t, Dimensions));
+    else
     @fmb Slice!(N, Range) dropOne(size_t N, Range)(Slice!(N, Range) slice)
     {
         foreach (i, dimension; Dimensions)
@@ -904,35 +892,29 @@ template dropOne(Dimensions...)
 }
 
 ///ditto
-Slice!(N, Range) dropOne(size_t N, Range)(Slice!(N, Range) slice, size_t dimension)
-in
-{
-    mixin (DimensionRTError);
-}
-body
-{
-    slice.popFront(dimension);
-    return slice;
-}
-
-///ditto
-Slice!(N, Range) dropOne(size_t N, Range)(Slice!(N, Range) slice, in size_t[] dimensions...)
+Slice!(N, Range) dropOne(size_t N, Range, size_t M)(Slice!(N, Range) slice, size_t[M] dimensions...)
 in
 {
     foreach (dimension; dimensions)
         mixin (DimensionRTError);
 }
 body
 {
-    foreach (dimension; dimensions)
+    foreach (i; Iota!(0, M))
+    {
+        auto dimension = dimensions[i];
         slice.popFront(dimension);
+    }
     return slice;
 }
 
 ///ditto
 template dropBackOne(Dimensions...)
     if (Dimensions.length)
 {
+    static if (!allSatisfy!(isSize_t, Dimensions))
+        alias dropBackOne = .dropBackOne!(staticMap!(toSize_t, Dimensions));
+    else
     @fmb Slice!(N, Range) dropBackOne(size_t N, Range)(Slice!(N, Range) slice)
     {
         foreach (i, dimension; Dimensions)
@@ -945,28 +927,19 @@ template dropBackOne(Dimensions...)
 }
 
 ///ditto
-Slice!(N, Range) dropBackOne(size_t N, Range)(Slice!(N, Range) slice, size_t dimension)
-in
-{
-    mixin (DimensionRTError);
-}
-body
-{
-    slice.popBack(dimension);
-    return slice;
-}
-
-///ditto
-Slice!(N, Range) dropBackOne(size_t N, Range)(Slice!(N, Range) slice, in size_t[] dimensions...)
+Slice!(N, Range) dropBackOne(size_t N, Range, size_t M)(Slice!(N, Range) slice, size_t[M] dimensions...)
 in
 {
     foreach (dimension; dimensions)
         mixin (DimensionRTError);
 }
 body
 {
-    foreach (dimension; dimensions)
+    foreach (i; Iota!(0, M))
+    {
+        auto dimension = dimensions[i];
         slice.popBack(dimension);
+    }
     return slice;
 }
 
@@ -1029,6 +1002,9 @@ Returns:
 template dropExactly(Dimensions...)
     if (Dimensions.length)
 {
+    static if (!allSatisfy!(isSize_t, Dimensions))
+        alias dropExactly = .dropExactly!(staticMap!(toSize_t, Dimensions));
+    else
     @fmb Slice!(N, Range) dropExactly(size_t N, Range)(Slice!(N, Range) slice, Repeat!(Dimensions.length, size_t) ns)
     body
     {
@@ -1057,6 +1033,9 @@ body
 template dropBackExactly(Dimensions...)
     if (Dimensions.length)
 {
+    static if (!allSatisfy!(isSize_t, Dimensions))
+        alias dropBackExactly = .dropBackExactly!(staticMap!(toSize_t, Dimensions));
+    else
     @fmb Slice!(N, Range) dropBackExactly(size_t N, Range)(Slice!(N, Range) slice, Repeat!(Dimensions.length, size_t) ns)
     body
     {
@@ -1118,6 +1097,9 @@ Returns:
 template drop(Dimensions...)
     if (Dimensions.length)
 {
+    static if (!allSatisfy!(isSize_t, Dimensions))
+        alias drop = .drop!(staticMap!(toSize_t, Dimensions));
+    else
     @fmb Slice!(N, Range) drop(size_t N, Range)(Slice!(N, Range) slice, Repeat!(Dimensions.length, size_t) ns)
     body
     {
@@ -1146,6 +1128,9 @@ body
 template dropBack(Dimensions...)
     if (Dimensions.length)
 {
+    static if (!allSatisfy!(isSize_t, Dimensions))
+        alias dropBack = .dropBack!(staticMap!(toSize_t, Dimensions));
+    else
     @fmb Slice!(N, Range) dropBack(size_t N, Range)(Slice!(N, Range) slice, Repeat!(Dimensions.length, size_t) ns)
     body
     {