workaround D dips bugs (#207)

* fix small string * workaround dlang dips bugs

Author: 9il

source/mir/algorithm/iteration.d

@@ -503,13 +503,13 @@ scope const:
 Сount bits until set bit count is reached. Works with ndslices created with $(REF bitwise, mir,ndslice,topology), $(REF bitSlice, mir,ndslice,allocation).
 Returns: bit count if set bit count is reached or `-1` otherwise.
 +/
-sizediff_t nBitsToCount(Field, I)(scope Slice!(FieldIterator!(BitField!(Field, I))) bitSlice, size_t count)
+sizediff_t nBitsToCount(Field, I)(Slice!(FieldIterator!(BitField!(Field, I))) bitSlice, size_t count)
 {
  return BitSliceAccelerator!(Field, I)(bitSlice).nBitsToCount(count);
 }
 
 ///ditto
-sizediff_t nBitsToCount(Field, I)(scope Slice!(RetroIterator!(FieldIterator!(BitField!(Field, I)))) bitSlice, size_t count)
+sizediff_t nBitsToCount(Field, I)(Slice!(RetroIterator!(FieldIterator!(BitField!(Field, I)))) bitSlice, size_t count)
 {
  import mir.ndslice.topology: retro;
  return BitSliceAccelerator!(Field, I)(bitSlice.retro).retroNBitsToCount(count);
@@ -1071,7 +1071,7 @@ template eachUploPair(alias fun, bool includeDiagonal = false)
  Params:
  matrix = Square matrix.
  +/
- auto eachUploPair(Iterator, SliceKind kind)(scope Slice!(Iterator, 2, kind) matrix)
+ auto eachUploPair(Iterator, SliceKind kind)(Slice!(Iterator, 2, kind) matrix)
  in
  {
  assert(matrix.length!0 == matrix.length!1, "matrix must be square.");

source/mir/interpolate/constant.d

@@ -82,7 +82,7 @@ template constant(T, size_t N = 1, FirstGridIterator = immutable(T)*, NextGridIt
  +/
  Constant!(T, N, GridIterators) constant(yIterator, SliceKind ykind)(
  GridVectors grid,
- scope Slice!(yIterator, 1, ykind) values
+ Slice!(yIterator, 1, ykind) values
  ) pure @trusted
  {
  static if (__VERSION__ >= 2085) import core.lifetime: move; else import std.algorithm.mutation: move; 

source/mir/interpolate/linear.d

@@ -58,7 +58,7 @@ template linear(T, size_t N = 1, FirstGridIterator = immutable(T)*, NextGridIter
  +/
  Linear!(T, N, GridIterators) linear(yIterator, SliceKind ykind)(
  GridVectors grid,
- scope Slice!(yIterator, N, ykind) values,
+ Slice!(yIterator, N, ykind) values,
  ) pure @trusted
  {
  static if (__VERSION__ >= 2085) import core.lifetime: move; else import std.algorithm.mutation: move; 

source/mir/interpolate/pchip.d

@@ -46,7 +46,7 @@ template pchip(T, size_t N = 1, FirstGridIterator = immutable(T)*, NextGridItera
  +/
  @fmamath Spline!(T, N, GridIterators) pchip(yIterator, SliceKind ykind)(
  GridVectors grid,
- scope Slice!(yIterator, N, ykind) values) @safe
+ Slice!(yIterator, N, ykind) values) @safe
  {
  static if (__VERSION__ >= 2085) import core.lifetime: move; else import std.algorithm.mutation: move; 
  auto ret = Spline!T(grid);
@@ -133,9 +133,9 @@ Constraints:
  `points`, `values`, and `slopes` must have the same length >= 3
 +/
 void pchipSlopes(IG, IV, IS, SliceKind gkind, SliceKind vkind, SliceKind skind)(
- scope Slice!(IG, 1, gkind) points,
- scope Slice!(IV, 1, vkind) values,
- scope Slice!(IS, 1, skind) slopes) @trusted
+ Slice!(IG, 1, gkind) points,
+ Slice!(IV, 1, vkind) values,
+ Slice!(IS, 1, skind) slopes) @trusted
 {
  if (points.length < 3)
  assert(0);

source/mir/interpolate/polynomial.d

@@ -76,7 +76,7 @@ Lagrange!(T, maxDerivative) lagrange(uint maxDerivative = 0, T, X)(scope const T
 
 /// ditto
 Lagrange!(Unqual!(Slice!(YIterator, 1, ykind).DeepElement), maxDerivative)
- lagrange(uint maxDerivative = 0, XIterator, SliceKind xkind, YIterator, SliceKind ykind)(scope Slice!(XIterator, 1, xkind) x, scope Slice!(YIterator, 1, ykind) y) @trusted
+ lagrange(uint maxDerivative = 0, XIterator, SliceKind xkind, YIterator, SliceKind ykind)(Slice!(XIterator, 1, xkind) x, Slice!(YIterator, 1, ykind) y) @trusted
  if (maxDerivative < 16)
 {
  alias T = Unqual!(Slice!(YIterator, 1, ykind).DeepElement);
@@ -188,7 +188,7 @@ scope const:
  const idx = tuple[0];
  const grid = _grid[].sliced;
  const inversedBarycentricWeights = _inversedBarycentricWeights[].sliced;
- scope Slice!(const(T)*)[derivative + 1] values;
+ Slice!(const(T)*)[derivative + 1] values;
  foreach (i; Iota!(derivative + 1))
  values[i] = _normalizedValues[i][].sliced;
  const T[2] pd = [
@@ -252,7 +252,7 @@ scope const:
 +/
 pragma(inline, false)
 @nogc
-RCArray!(immutable T) inversedBarycentricWeights(T)(scope Slice!(const(T)*) x)
+RCArray!(immutable T) inversedBarycentricWeights(T)(Slice!(const(T)*) x)
  if (isFloatingPoint!T)
 {
  const n = x.length;

source/mir/interpolate/spline.d

@@ -348,7 +348,7 @@ template spline(T, size_t N = 1, FirstGridIterator = immutable(T)*, NextGridIter
  +/
  Spline!(T, N, GridIterators) spline(yIterator, SliceKind ykind)(
  GridVectors grid,
- scope Slice!(yIterator, N, ykind) values,
+ Slice!(yIterator, N, ykind) values,
  SplineBoundaryType typeOfBoundaries = SplineBoundaryType.notAKnot,
  in T valueOfBoundaryConditions = 0,
  )
@@ -367,7 +367,7 @@ template spline(T, size_t N = 1, FirstGridIterator = immutable(T)*, NextGridIter
  +/
  Spline!(T, N, GridIterators) spline(yIterator, SliceKind ykind)(
  GridVectors grid,
- scope Slice!(yIterator, N, ykind) values,
+ Slice!(yIterator, N, ykind) values,
  SplineBoundaryCondition!T boundaries,
  )
  {
@@ -386,7 +386,7 @@ template spline(T, size_t N = 1, FirstGridIterator = immutable(T)*, NextGridIter
  +/
  Spline!(T, N, GridIterators) spline(yIterator, SliceKind ykind)(
  GridVectors grid,
- scope Slice!(yIterator, N, ykind) values,
+ Slice!(yIterator, N, ykind) values,
  SplineBoundaryCondition!T rBoundary,
  SplineBoundaryCondition!T lBoundary,
  )
@@ -492,7 +492,7 @@ struct Spline(F, size_t N = 1, FirstGridIterator = immutable(F)*, NextGridIterat
  Assigns function values to the internal memory.
  $(RED For internal use.)
  +/
- void _values(SliceKind kind, Iterator)(scope Slice!(Iterator, N, kind) values) scope @property @trusted
+ void _values(SliceKind kind, Iterator)(Slice!(Iterator, N, kind) values) scope @property @trusted
  {
  assert(values.shape == _data.shape, "'values' should have the same shape as the .gridShape");
  pickDataSubslice(_data, 0)[] = values;
@@ -772,10 +772,10 @@ Constraints:
  `temp` must have length greater or equal to points less minus one.
 +/
 void splineSlopes(F, T, IP, IV, IS, SliceKind gkind, SliceKind vkind, SliceKind skind)(
- scope Slice!(IP, 1, gkind) points,
- scope Slice!(IV, 1, vkind) values,
- scope Slice!(IS, 1, skind) slopes,
- scope Slice!(T*) temp,
+ Slice!(IP, 1, gkind) points,
+ Slice!(IV, 1, vkind) values,
+ Slice!(IS, 1, skind) slopes,
+ Slice!(T*) temp,
  SplineBoundaryCondition!F lbc,
  SplineBoundaryCondition!F rbc,
  ) @trusted

source/mir/ndslice/slice.d

@@ -2518,7 +2518,7 @@ public:
  static if (isMutable!DeepElement)
  {
  private void opIndexOpAssignImplSlice(string op, RIterator, size_t RN, SliceKind rkind)
- (scope Slice!(RIterator, RN, rkind) value) scope
+ (Slice!(RIterator, RN, rkind) value) scope
  {
  static if (N > 1 && RN == N && kind == Contiguous && rkind == Contiguous)
  {
@@ -2574,7 +2574,7 @@ public:
  Assignment of a value of `Slice` type to a $(B fully defined slice).
  +/
  void opIndexAssign(RIterator, size_t RN, SliceKind rkind, Slices...)
- (scope Slice!(RIterator, RN, rkind) value, Slices slices) scope return
+ (Slice!(RIterator, RN, rkind) value, Slices slices) scope return
  if (isFullPureSlice!Slices || isIndexedSlice!Slices)
  {
  auto sl = this.lightScope.opIndex(slices);
@@ -3464,8 +3464,8 @@ private bool _checkAssignLengths(
  size_t LN, size_t RN,
  SliceKind lkind, SliceKind rkind,
  )
- (scope Slice!(LIterator, LN, lkind) ls,
- scope Slice!(RIterator, RN, rkind) rs)
+ (Slice!(LIterator, LN, lkind) ls,
+ Slice!(RIterator, RN, rkind) rs)
 {
  static if (isInstanceOf!(SliceIterator, LIterator))
  {
@@ -3792,3 +3792,13 @@ version(mir_test) pure nothrow unittest
  Slice!(LightImmutableOf!(double*), 2, Universal) immvalues = (cast(immutable)df).values;
  assert(immvalues[0][0] == 5);
 }
+
+version(mir_test) @safe unittest
+{
+ import mir.ndslice.allocation;
+ auto a = rcslice!double([2, 3], 0);
+ auto b = rcslice!double([2, 3], 0);
+ a[1, 2] = 3;
+ b[] = a;
+ assert(a == b);
+}

source/mir/ndslice/sorting.d

@@ -486,7 +486,7 @@ template transitionIndex(alias test = "a < b")
  v = value to test with. It is passed to second argument.
  +/
  size_t transitionIndex(Iterator, SliceKind kind, V)
- (auto ref scope Slice!(Iterator, 1, kind) slice, auto ref scope const V v)
+ (auto ref Slice!(Iterator, 1, kind) slice, auto ref scope const V v)
  {
  size_t first = 0, count = slice.length;
  while (count > 0)
@@ -551,7 +551,7 @@ Params:
  r = The slice/array to index.
 Returns: Index slice/array.
 +/
-Slice!(I*) makeIndex(I = size_t, alias less = "a < b", Iterator, SliceKind kind)(scope Slice!(Iterator, 1, kind) r)
+Slice!(I*) makeIndex(I = size_t, alias less = "a < b", Iterator, SliceKind kind)(Slice!(Iterator, 1, kind) r)
 {
  import mir.functional: naryFun;
  import mir.ndslice.allocation: slice;