v3.1.1

9il · 9il · commit b4450d69afa7 · 2018-11-11T19:55:37.000+07:00
diff --git a/.travis.yml b/.travis.yml
@@ -35,6 +35,7 @@ install:
 script:
 #  - travis_wait 100 dub test --arch "$ARCH"
  - travis_wait 100 dub test --arch "$ARCH" --build=unittest-cov
+ - travis_wait 100 dub test --arch "$ARCH" -c dips
  - ./test_examples.sh
  - meson build && cd build && ninja -j4 && ninja -j4 test -v && cd .. # TODO: 32bit meson test
 #  - travis_wait 100 dub test --arch "$ARCH" --build=unittest-release
diff --git a/source/mir/ndslice/slice.d b/source/mir/ndslice/slice.d
@@ -345,7 +345,7 @@ Slice!(Iterator, N, kind)
     (Slice!(Iterator, 1, kind) slice, size_t[N] lengths...)
     if (N)
 {
-    typeof(return)._Structure structure;
+    auto structure = typeof(return)._Structure.init;
     structure[0] = lengths;
     static if (kind != Contiguous)
     {
@@ -908,14 +908,12 @@ public:
     ///
     auto lightImmutable()() scope return immutable @property
     {
-        import mir.qualifier: LightImmutableOf, lightImmutable;
         return Slice!(LightImmutableOf!Iterator, N, kind)(_structure, _iterator.lightImmutable);
     }
 
     /// ditto
     auto lightConst()() scope return const @property
     {
-        import mir.qualifier: LightConstOf, lightConst;
         return Slice!(LightConstOf!Iterator, N, kind)(_structure, _iterator.lightConst);
     }
 
@@ -1418,7 +1416,7 @@ public:
         if (dimension < N)
     {
         assert(!empty!dimension);
-        typeof(return)._Structure structure_;
+        auto structure_ = typeof(return)._Structure.init;
 
         foreach (i; Iota!(typeof(return).N))
         {
@@ -1836,10 +1834,19 @@ public:
             && __traits(compiles, this._iterator == rslice._iterator)
             )
         {
-            foreach (i; Iota!N)
-                if (this._lengths[i] != rslice._lengths[i])
+            if (this._lengths != rslice._lengths)
+                return false;
+            static if (kind == rkind)
+            {
+                if (this._strides != rslice._strides)
                     return false;
-            if (this._strides == rslice._strides && this._iterator == rslice._iterator)
+            }
+            else
+            {
+                if (this.strides != rslice.strides)
+                    return false;
+            }
+            if (this._iterator == rslice._iterator)
                 return true;
         }
         import mir.algorithm.iteration : equal;
@@ -1981,7 +1988,7 @@ public:
             else
                 enum K = Canonical;
             alias Ret = Slice!(Iterator, N - F, K);
-            Ret._Structure structure_;
+            auto structure_ = Ret._Structure.init;
 
             enum bool shrink = kind == Canonical && slices.length == N;
             static if (shrink)
diff --git a/source/mir/ndslice/topology.d b/source/mir/ndslice/topology.d
@@ -1225,7 +1225,7 @@ Slice!(Iterator, M, kind) reshape
     else
     {
         alias Ret = typeof(return);
-        Ret._Structure structure;
+        auto structure = Ret._Structure.init;
         alias lengths = structure[0];
         foreach (i; Iota!M)
             lengths[i] = rlengths[i];
@@ -2111,7 +2111,7 @@ auto bitwise
         alias It = FieldIterator!(BitField!Iterator);
     }
     alias Ret = Slice!(It, N, kind);
-    Ret._Structure structure_;
+    auto structure_ = Ret._Structure.init;
     foreach(i; Iota!(Ret.N))
         structure_[0][i] = slice._lengths[i];
     structure_[0][$ - 1] *= I.sizeof * 8;
@@ -2213,7 +2213,7 @@ auto bitpack
         alias It = FieldIterator!(BitpackField!(Iterator, pack));
     }
     alias Ret = Slice!(It, N, kind);
-    Ret._Structure structure;
+    auto structure = Ret._Structure.init;
     foreach(i; Iota!(Ret.N))
         structure[0][i] = slice._lengths[i];
     structure[0][$ - 1] *= I.sizeof * 8;
@@ -3195,7 +3195,7 @@ auto zip
             enum kind = maxElem(staticMap!(kindOf, Slices));
             alias Iterator = ZipIterator!(staticMap!(_IteratorOf, Slices));
             alias Ret = Slice!(Iterator, N, kind);
-            Ret._Structure structure;
+            auto structure = Ret._Structure.init;
             structure[0] = slices[0]._lengths;
             foreach (i; Iota!(Ret.S))
                 structure[1][i] = slices[0]._strides[i];
diff --git a/source/mir/rcarray.d b/source/mir/rcarray.d
@@ -73,7 +73,11 @@ struct mir_rcarray(T)
     static assert(Context.sizeof % 16 == 0);
 
     ///
-    private Context* _context;
+    private T* _payload;
+    private ref inout(Context*) _context() inout scope return pure nothrow @nogc @trusted @property
+    {
+        return *cast(inout(Context*)*)&_payload;
+    }
 
     // private inout(Context)* _context() inout @trusted pure nothrow @nogc scope
     // {
@@ -86,7 +90,7 @@ struct mir_rcarray(T)
     // }
 
     ///
-    this(this) scope @safe pure nothrow @nogc
+    this(this) scope @trusted pure nothrow @nogc
     {
         import core.atomic: atomicOp;
         if (_context !is null) with(*_context)
@@ -111,8 +115,8 @@ struct mir_rcarray(T)
                     T[] array;
                     ()@trusted { array = (cast(T*)(_context + 1))[0 .. length]; }();
                     xdestroy(array);
-                    auto p = cast(void*) _context;
                     () @trusted {
+                        auto p = cast(void*) _payload;
                         with(*_context)
                         {
                             if (_delegateContext !is null)
@@ -142,7 +146,7 @@ struct mir_rcarray(T)
     {
         ///
         pragma(inline, false)
-        ~this() scope nothrow @nogc
+        ~this() scope nothrow @nogc @safe
         {
             dec();
         }
@@ -154,17 +158,17 @@ struct mir_rcarray(T)
             return initializeImpl(length, alignment, deallocate);
         }
 
-        // ///
-        // this(ref typeof(this) rhs) @safe pure nothrow @nogc
-        // {
-        //     this._context = rhs._context;
-        //     this.__xpostblit;
-        // }
+        ///
+        this(ref typeof(this) rhs) @safe pure nothrow @nogc
+        {
+            this._context = rhs._context;
+            this.__xpostblit;
+        }
     }
     else
     {
         pragma(inline, false)
-        ~this() scope nothrow @nogc
+        ~this() scope nothrow @nogc @safe
         {
             dec();
         }
@@ -240,13 +244,13 @@ struct mir_rcarray(T)
     }
 
     ///
-    size_t length() @safe scope pure nothrow @nogc @property
+    size_t length() @trusted scope pure nothrow @nogc @property
     {
         return _context !is null ? _context.length : 0;
     }
 
     ///
-    size_t counter() @safe scope pure nothrow @nogc @property
+    size_t counter() @trusted scope pure nothrow @nogc @property
     {
         return _context !is null ? _context.counter : 0;
     }
@@ -260,7 +264,7 @@ struct mir_rcarray(T)
     ///
     ref opIndex(size_t i) @trusted scope inout
     {
-        assert(_context);
+        assert(_payload);
         assert(i < _context.length);
         return (cast(inout(T)*)(_context + 1))[i];
     }
@@ -277,17 +281,14 @@ struct mir_rcarray(T)
         return _context !is null ?  (cast(inout(T)*)(_context + 1))[0 .. _context.length] : null;
     }
 
-    mir_rcarray!(const T) lightConst() const @nogc nothrow @trusted
-    {
-        return cast(typeof(return)) this;
-    }
+    ///
+    mir_rcarray!(const T) lightConst()() scope return const @nogc nothrow @trusted @property
+    { return cast(typeof(return)) this; }
 
-    mir_rcarray!(immutable T) lightImmutable() immutable @nogc nothrow @trusted
-    {
-        return cast(typeof(return)) this;
-    }
+    mir_rcarray!(immutable T) lightImmutable()() scope return immutable @nogc nothrow @trusted @property
+    { return cast(typeof(return)) this; }
 
-    size_t opDollar(size_t pos : 0)() @safe scope pure nothrow @nogc
+    size_t opDollar(size_t pos : 0)() @trusted scope pure nothrow @nogc
     {
         return _context !is null ? _context.length : 0;
     }
@@ -300,11 +301,15 @@ struct mir_rcarray(T)
     }
 }
 
+/// ditto
+alias RCArray = mir_rcarray;
+
 ///
+version(mir_test)
 @safe pure @nogc
 unittest
 {
-    auto a = mir_rcarray!double(10);
+    auto a = RCArray!double(10);
     foreach(i, ref e; a)
         e = i;
     auto b = a;
@@ -339,14 +344,13 @@ struct mir_rci(T)
     // }
 
     ///
-    mir_rcarray!T _array;
+    RCArray!T _array;
 
-    ///
-    mir_rci!(const T) lightConst()() const @property
+
+    mir_rci!(const T) lightConst() scope return const @nogc nothrow @trusted @property
     { return typeof(return)(_iterator, _array.lightConst); }
 
-    ///
-    mir_rci!(immutable T) lightImmutable()() immutable @property
+    mir_rci!(immutable T) lightImmutable() scope return immutable @nogc nothrow @trusted @property
     { return typeof(return)(_iterator, _array.lightImmutable); }
 
     ///   
@@ -367,7 +371,7 @@ struct mir_rci(T)
         if (op == "-" || op == "+")
     { mixin("_iterator " ~ op ~ "= index;"); }
 
-    ///   
+    ///
     mir_rci!T opBinary(string op)(ptrdiff_t index)
         if (op == "+" || op == "-")
     { return mir_rci!T(_iterator + index, _array); }
@@ -399,9 +403,10 @@ struct mir_rci(T)
 alias RCI = mir_rci;
 
 ///
+version(mir_test)
 @nogc unittest
 {
-    import mir.ndslice;
+    import mir.ndslice.slice;
     import mir.rcarray;
     auto array = mir_rcarray!double(10);
     auto slice = array.asSlice;
@@ -413,9 +418,10 @@ alias RCI = mir_rci;
 }
 
 ///
+version(mir_test)
 @nogc unittest
 {
-    import mir.ndslice;
+    import mir.ndslice.slice;
     import mir.rcarray;
 
     alias rcvec = Slice!(RCI!double);
@@ -431,3 +437,30 @@ alias RCI = mir_rci;
         x = x.save;
     }
 }
+
+version(mir_test)
+@safe @nogc unittest
+{
+    import mir.ndslice;
+    import mir.rcarray;
+
+    @safe void bar(ref const mir_rcarray!(const double) a, ref mir_rcarray!(const double) b)
+    {
+        b = a;
+    }
+
+    @safe void bari(ref immutable mir_rcarray!(immutable double) a, ref mir_rcarray!(immutable double) b)
+    {
+        b = a;
+    }
+
+    @safe void foo(ref const RCI!(const double) a, ref RCI!(const double) b)
+    {
+        b = a;
+    }
+
+    @safe void fooi(ref immutable RCI!(immutable double) a, ref RCI!(immutable double) b)
+    {
+        b = a;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ Slice!(Iterator, N, kind)`
`345`	`345`	`(Slice!(Iterator, 1, kind) slice, size_t[N] lengths...)`
`346`	`346`	`if (N)`
`347`	`347`	`{`
`348`		`- typeof(return)._Structure structure;`
	`348`	`+ auto structure = typeof(return)._Structure.init;`
`349`	`349`	`structure[0] = lengths;`
`350`	`350`	`static if (kind != Contiguous)`
`351`	`351`	`{`
`@@ -908,14 +908,12 @@ public:`
`908`	`908`	`///`
`909`	`909`	`auto lightImmutable()() scope return immutable @property`
`910`	`910`	`{`
`911`		`- import mir.qualifier: LightImmutableOf, lightImmutable;`
`912`	`911`	`return Slice!(LightImmutableOf!Iterator, N, kind)(_structure, _iterator.lightImmutable);`
`913`	`912`	`}`
`914`	`913`
`915`	`914`	`/// ditto`
`916`	`915`	`auto lightConst()() scope return const @property`
`917`	`916`	`{`
`918`		`- import mir.qualifier: LightConstOf, lightConst;`
`919`	`917`	`return Slice!(LightConstOf!Iterator, N, kind)(_structure, _iterator.lightConst);`
`920`	`918`	`}`
`921`	`919`
`@@ -1418,7 +1416,7 @@ public:`
`1418`	`1416`	`if (dimension < N)`
`1419`	`1417`	`{`
`1420`	`1418`	`assert(!empty!dimension);`
`1421`		`- typeof(return)._Structure structure_;`
	`1419`	`+ auto structure_ = typeof(return)._Structure.init;`
`1422`	`1420`
`1423`	`1421`	`foreach (i; Iota!(typeof(return).N))`
`1424`	`1422`	`{`
`@@ -1836,10 +1834,19 @@ public:`
`1836`	`1834`	`&& __traits(compiles, this._iterator == rslice._iterator)`
`1837`	`1835`	`)`
`1838`	`1836`	`{`
`1839`		`- foreach (i; Iota!N)`
`1840`		`- if (this._lengths[i] != rslice._lengths[i])`
	`1837`	`+ if (this._lengths != rslice._lengths)`
	`1838`	`+ return false;`
	`1839`	`+ static if (kind == rkind)`
	`1840`	`+ {`
	`1841`	`+ if (this._strides != rslice._strides)`
`1841`	`1842`	`return false;`
`1842`		`- if (this._strides == rslice._strides && this._iterator == rslice._iterator)`
	`1843`	`+ }`
	`1844`	`+ else`
	`1845`	`+ {`
	`1846`	`+ if (this.strides != rslice.strides)`
	`1847`	`+ return false;`
	`1848`	`+ }`
	`1849`	`+ if (this._iterator == rslice._iterator)`
`1843`	`1850`	`return true;`
`1844`	`1851`	`}`
`1845`	`1852`	`import mir.algorithm.iteration : equal;`
`@@ -1981,7 +1988,7 @@ public:`
`1981`	`1988`	`else`
`1982`	`1989`	`enum K = Canonical;`
`1983`	`1990`	`alias Ret = Slice!(Iterator, N - F, K);`
`1984`		`- Ret._Structure structure_;`
	`1991`	`+ auto structure_ = Ret._Structure.init;`
`1985`	`1992`
`1986`	`1993`	`enum bool shrink = kind == Canonical && slices.length == N;`
`1987`	`1994`	`static if (shrink)`