mirror of
https://github.com/dlang/phobos.git
synced 2025-05-04 17:11:26 +03:00
change usage of swapAt to UFCS
This commit is contained in:
parent
c373792434
commit
b05f4afe1c
4 changed files with 14 additions and 14 deletions
|
@ -1926,7 +1926,7 @@ if (isRandomAccessRange!Range && hasLength!Range)
|
|||
immutable steps = r.length/2;
|
||||
for (size_t i = 0; i < steps; i++)
|
||||
{
|
||||
swapAt(r, i, last-i);
|
||||
r.swapAt(i, last-i);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -897,21 +897,21 @@ private size_t getPivot(alias less, Range)(Range r)
|
|||
|
||||
switch(result) {
|
||||
case 0b001:
|
||||
swapAt(r, 0, len - 1);
|
||||
swapAt(r, 0, mid);
|
||||
r.swapAt(0, len - 1);
|
||||
r.swapAt(0, mid);
|
||||
break;
|
||||
case 0b110:
|
||||
swapAt(r, mid, len - 1);
|
||||
r.swapAt(mid, len - 1);
|
||||
break;
|
||||
case 0b011:
|
||||
swapAt(r, 0, mid);
|
||||
r.swapAt(0, mid);
|
||||
break;
|
||||
case 0b100:
|
||||
swapAt(r, mid, len - 1);
|
||||
swapAt(r, 0, mid);
|
||||
r.swapAt(mid, len - 1);
|
||||
r.swapAt(0, mid);
|
||||
break;
|
||||
case 0b000:
|
||||
swapAt(r, 0, len - 1);
|
||||
r.swapAt(0, len - 1);
|
||||
break;
|
||||
case 0b111:
|
||||
break;
|
||||
|
@ -952,7 +952,7 @@ private void optimisticInsertionSort(alias less, Range)(Range r)
|
|||
{
|
||||
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);
|
||||
|
||||
// partition
|
||||
swapAt(r, pivotIdx, r.length - 1);
|
||||
r.swapAt(pivotIdx, r.length - 1);
|
||||
size_t lessI = size_t.max, greaterI = r.length - 1;
|
||||
|
||||
while (true)
|
||||
|
@ -1237,10 +1237,10 @@ private void quickSortImpl(alias less, Range)(Range r, size_t depth)
|
|||
{
|
||||
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 left = r[0 .. min(lessI, greaterI + 1)];
|
||||
|
|
|
@ -277,7 +277,7 @@ and $(D length == capacity), throws an exception.
|
|||
auto parentIdx = (n - 1) / 2;
|
||||
if (!comp(_store[parentIdx], _store[n])) break; // done!
|
||||
// must swap and continue
|
||||
swapAt(_store, parentIdx, n);
|
||||
_store.swapAt(parentIdx, n);
|
||||
n = parentIdx;
|
||||
}
|
||||
++_length;
|
||||
|
|
|
@ -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.");
|
||||
foreach (i; 0 .. n)
|
||||
{
|
||||
swapAt(r, i, uniform(i, r.length, gen));
|
||||
r.swapAt(i, uniform(i, r.length, gen));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue