mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-03 16:40:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Convert sep to array for performance/generality.

Browse source
This commit is contained in:
Peter Alexander 2012-12-27 16:38:26 +00:00
parent b6c9ffed91
commit 221ea836fa
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
std/array.d
View file

@ -1441,7 +1441,7 @@ assert(join([[1, 2, 3], [4, 5]]) == [1, 2, 3, 4, 5]);
ElementEncodingType!(ElementType!RoR)[] join(RoR, R)(RoR ror, R sep) ElementEncodingType!(ElementType!RoR)[] join(RoR, R)(RoR ror, R sep)
if(isInputRange!RoR && if(isInputRange!RoR &&
isInputRange!(ElementType!RoR) && isInputRange!(ElementType!RoR) &&
isForwardRange!R && isInputRange!R &&
is(Unqual!(ElementType!(ElementType!RoR)) == Unqual!(ElementType!R))) is(Unqual!(ElementType!(ElementType!RoR)) == Unqual!(ElementType!R)))
{ {
alias ElementType!RoR RoRElem; alias ElementType!RoR RoRElem;
@ -1450,15 +1450,11 @@ ElementEncodingType!(ElementType!RoR)[] join(RoR, R)(RoR ror, R sep)
if (ror.empty) if (ror.empty)
return RetType.init; return RetType.init;
static if (isNarrowString!R || isNarrowString!RetType) auto sepArr = to!(RetType)(sep);
auto sepArr = to!(RetType)(sep);
else
alias sep sepArr;
auto result = appender!(RetType)(); auto result = appender!(RetType)();
static if(isForwardRange!RoR && static if(isForwardRange!RoR &&
hasLength!RoR && hasLength!RoR &&
(isNarrowString!RetType || hasLength!RoRElem && hasLength!R)) (isNarrowString!RetType || hasLength!RoRElem))
{ {
immutable resultLen = reduce!"a + b.length"(cast(size_t) 0, ror.save) immutable resultLen = reduce!"a + b.length"(cast(size_t) 0, ror.save)
+ sepArr.length * (ror.length - 1); + sepArr.length * (ror.length - 1);