mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-06 02:45:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

change usage of swapAt to UFCS

Browse source
This commit is contained in:
Sebastian Wilzbach 2016-04-06 13:59:06 +03:00
parent c373792434
commit b05f4afe1c
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
std/algorithm/mutation.d
View file

@ -1926,7 +1926,7 @@ if (isRandomAccessRange!Range && hasLength!Range)
immutable steps = r.length/2; immutable steps = r.length/2;
for (size_t i = 0; i < steps; i++) for (size_t i = 0; i < steps; i++)
{ {
swapAt(r, i, last-i); r.swapAt(i, last-i);
} }
} }

22
std/algorithm/sorting.d
View file

@ -897,21 +897,21 @@ private size_t getPivot(alias less, Range)(Range r)
switch(result) { switch(result) {
case 0b001: case 0b001:
swapAt(r, 0, len - 1); r.swapAt(0, len - 1);
swapAt(r, 0, mid); r.swapAt(0, mid);
break; break;
case 0b110: case 0b110:
swapAt(r, mid, len - 1); r.swapAt(mid, len - 1);
break; break;
case 0b011: case 0b011:
swapAt(r, 0, mid); r.swapAt(0, mid);
break; break;
case 0b100: case 0b100:
swapAt(r, mid, len - 1); r.swapAt(mid, len - 1);
swapAt(r, 0, mid); r.swapAt(0, mid);
break; break;
case 0b000: case 0b000:
swapAt(r, 0, len - 1); r.swapAt(0, len - 1);
break; break;
case 0b111: case 0b111:
break; break;
@ -952,7 +952,7 @@ private void optimisticInsertionSort(alias less, Range)(Range r)
{ {
for (; j < maxJ && pred(r[j + 1], r[j]); ++j) for (; j < maxJ && pred(r[j + 1], r[j]); ++j)
{ {
swapAt(r, j, j + 1); r.swapAt(j, j + 1);
} }
} }
} }
@ -1225,7 +1225,7 @@ private void quickSortImpl(alias less, Range)(Range r, size_t depth)
alias pred = binaryFun!(less); alias pred = binaryFun!(less);
// partition // partition
swapAt(r, pivotIdx, r.length - 1); r.swapAt(pivotIdx, r.length - 1);
size_t lessI = size_t.max, greaterI = r.length - 1; size_t lessI = size_t.max, greaterI = r.length - 1;
while (true) while (true)
@ -1237,10 +1237,10 @@ private void quickSortImpl(alias less, Range)(Range r, size_t depth)
{ {
break; break;
} }
swapAt(r, lessI, greaterI); r.swapAt(lessI, greaterI);
} }
swapAt(r, r.length - 1, lessI); r.swapAt(r.length - 1, lessI);
auto right = r[lessI + 1 .. r.length]; auto right = r[lessI + 1 .. r.length];
auto left = r[0 .. min(lessI, greaterI + 1)]; auto left = r[0 .. min(lessI, greaterI + 1)];

2
std/container/binaryheap.d
View file

@ -277,7 +277,7 @@ and $(D length == capacity), throws an exception.
auto parentIdx = (n - 1) / 2; auto parentIdx = (n - 1) / 2;
if (!comp(_store[parentIdx], _store[n])) break; // done! if (!comp(_store[parentIdx], _store[n])) break; // done!
// must swap and continue // must swap and continue
swapAt(_store, parentIdx, n); _store.swapAt(parentIdx, n);
n = parentIdx; n = parentIdx;
} }
++_length; ++_length;

2
std/random.d
View file

@ -1876,7 +1876,7 @@ void partialShuffle(Range, RandomGen)(Range r, in size_t n, ref RandomGen gen)
enforce(n <= r.length, "n must be <= r.length for partialShuffle."); enforce(n <= r.length, "n must be <= r.length for partialShuffle.");
foreach (i; 0 .. n) foreach (i; 0 .. n)
{ {
swapAt(r, i, uniform(i, r.length, gen)); r.swapAt(i, uniform(i, r.length, gen));
} }
} }