@safe ndslice

Author: 9il

source/mir/ndslice/allocation.d

@@ -76,7 +76,7 @@ auto slice(SliceKind kind, size_t[] packs, Iterator)(Slice!(kind, packs, Iterato
 }
 
 ///
-pure nothrow unittest
+@safe pure nothrow unittest
 {
     auto tensor = slice!int(5, 6, 7);
     assert(tensor.length == 5);
@@ -89,7 +89,7 @@ pure nothrow unittest
 }
 
 ///
-pure nothrow unittest
+@safe pure nothrow unittest
 {
     auto tensor = slice([2, 3], 5);
     assert(tensor.elementsCount == 2 * 3);
@@ -109,7 +109,7 @@ auto slice(size_t dim, Slices...)(Concatenation!(dim, Slices) concatenation)
     return ret;
 }
 
-pure nothrow unittest
+@safe pure nothrow unittest
 {
     import mir.ndslice.topology : iota;
     auto tensor = iota(2, 3).slice;
@@ -132,7 +132,7 @@ auto uninitializedSlice(T, size_t N)(size_t[N] lengths...)
 }
 
 ///
-pure nothrow unittest
+@safe pure nothrow unittest
 {
     auto tensor = uninitializedSlice!int(5, 6, 7);
     assert(tensor.length == 5);
@@ -259,7 +259,7 @@ makeUninitializedSlice(T, Allocator, size_t N)(auto ref Allocator alloc, size_t[
 }
 
 ///
-@nogc unittest
+@system @nogc unittest
 {
     import std.experimental.allocator;
     import std.experimental.allocator.mallocator;
@@ -306,7 +306,7 @@ auto ndarray(SliceKind kind, size_t[] packs, Iterator)(Slice!(kind, packs, Itera
 }
 
 ///
-pure nothrow unittest
+@safe pure nothrow unittest
 {
     import mir.ndslice.topology : iota;
     auto slice = iota(3, 4);

source/mir/ndslice/dynamic.d

@@ -83,6 +83,7 @@ import std.meta;
 import mir.internal.utility;
 import mir.ndslice.internal;
 import mir.ndslice.slice;
+import mir.utility;
 
 @fastmath:
 
@@ -330,24 +331,15 @@ Returns:
     n-dimensional slice of the same type
 See_also: $(LREF swapped), $(LREF transposed)
 +/
-Slice!(Universal, packs, Iterator) everted(size_t[] packs, Iterator)(Slice!(Universal, packs, Iterator) slice)
+Slice!(kind, packs, Iterator) everted(size_t[] packs, SliceKind kind, Iterator)(Slice!(kind, packs, Iterator) slice)
+    if (kind == Universal || kind == Canonical && packs.length > 1)
 {
-    mixin _DefineRet;
-    with (slice)
+    with(slice) foreach (i; Iota!(packs[0] / 2))
     {
-         foreach (i; Iota!(packs[0]))
-        {
-            ret._lengths[N - 1 - i] = _lengths[i];
-            ret._strides[N - 1 - i] = _strides[i];
-        }
-        foreach (i; Iota!(packs[0], slice.N))
-        {
-            ret._lengths[i] = _lengths[i];
-            ret._strides[i] = _strides[i];
-        }
-        ret._iterator = _iterator;
-        return ret;
+        swap(_lengths[i], _lengths[packs[0] - i - 1]);
+        swap(_strides[i], _strides[packs[0] - i - 1]);
     }
+    return slice;
 }
 
 ///
@@ -362,24 +354,21 @@ Slice!(Universal, packs, Iterator) everted(size_t[] packs, Iterator)(Slice!(Univ
 }
 
 private enum _transposedCode = q{
-    mixin _DefineRet;
-    with (slice)
+    size_t[typeof(return).N] lengths_;
+    ptrdiff_t[max(typeof(return).S, size_t(1))] strides_;
+    with(slice) foreach (i; Iota!(packs[0]))
     {
-        foreach (i; Iota!(packs[0]))
-        {
-            ret._lengths[i] = _lengths[perm[i]];
-            static if (i < ret.S)
-                ret._strides[i] = _strides[perm[i]];
-        }
-        foreach (i; Iota!(packs[0], slice.N))
-        {
-            ret._lengths[i] = _lengths[i];
-            static if (i < ret.S)
-                ret._strides[i] = _strides[i];
-        }
-        ret._iterator = _iterator;
-        return ret;
+        lengths_[i] = _lengths[perm[i]];
+        static if (i < typeof(return).S)
+            strides_[i] = _strides[perm[i]];
+    }
+    with(slice) foreach (i; Iota!(packs[0], slice.N))
+    {
+        lengths_[i] = _lengths[i];
+        static if (i < typeof(return).S)
+            strides_[i] = _strides[i];
     }
+    return typeof(return)(lengths_, strides_[0 .. typeof(return).S], slice._iterator);
 };
 
 private size_t[N] completeTranspose(size_t N)(size_t[] dimensions)
@@ -536,6 +525,7 @@ Returns:
     n-dimensional slice of the same type
 +/
 Slice!(kind, packs, Iterator) allReversed(SliceKind kind, size_t[] packs, Iterator)(Slice!(kind, packs, Iterator) slice)
+    @trusted
     if (kind == Universal || kind == Canonical && packs.length > 1)
 {
     foreach (dimension; Iota!(packs[0]))
@@ -571,7 +561,9 @@ template reversed(Dimensions...)
         alias reversed = .reversed!(staticMap!(toSize_t, Dimensions));
     else
     ///
-    @fastmath Slice!(kind, packs, Iterator) reversed(SliceKind kind, size_t[] packs, Iterator)(Slice!(kind, packs, Iterator) slice)
+    @fastmath Slice!(kind, packs, Iterator)
+        reversed(SliceKind kind, size_t[] packs, Iterator)(Slice!(kind, packs, Iterator) slice)
+        @trusted
         if (kind == Universal || kind == Canonical)
     {
         foreach (i, dimension; Dimensions)
@@ -585,6 +577,7 @@ template reversed(Dimensions...)
 
 ///ditto
 Slice!(kind, packs, Iterator) reversed(SliceKind kind, size_t[] packs, Iterator, size_t M)(Slice!(kind, packs, Iterator) slice, size_t[M] dimensions...)
+    @trusted
     if (kind == Universal || kind == Canonical)
 in
 {
@@ -602,7 +595,7 @@ body
 }
 
 ///
-pure nothrow unittest
+@safe pure nothrow unittest
 {
     import mir.ndslice.topology: iota, universal;
     auto slice = iota([2, 2], 1).universal;
@@ -626,7 +619,7 @@ pure nothrow unittest
 }
 
 ///
-pure nothrow unittest
+@safe pure nothrow unittest
 {
     import mir.ndslice.topology: iota, canonical;
     auto slice = iota([2, 2], 1).canonical;

source/mir/ndslice/package.d

@@ -628,7 +628,7 @@ pure nothrow unittest
     import std.range : iota;
     auto r = (10_000L * 2 * 3 * 4).iota;
 
-    auto t0 = r.sliced(10, 20, 30, 40);
+    auto t0 = r.slicedField(10, 20, 30, 40);
     assert(t0.length == 10);
     assert(t0.length!0 == 10);
     assert(t0.length!1 == 20);