mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-28 14:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split out std.array.join into join and joinImpl.

Browse source 
The idea is to make the template constraint match exactly what the user
needs to instantiate it rather than seeing the more complex template
constraints that the various overloads of join have. Not that the
resulting template constraint is altogether short either, but it's now
the bare minimum which all join overloads must match rather than
including the specifics necessary to distinguish each overload.
This commit is contained in:
jmdavis 2011-07-15 23:22:25 -07:00
parent fc51d8654e
commit ed6ede2e1c
1 changed files with 36 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

52
std/array.d
View file

@ -1171,6 +1171,7 @@ unittest
}
}
/++
Concatenates all of the ranges in $(D ror) together into one array using
$(D sep) as the separator if present.
@ -1185,6 +1186,35 @@ assert(join([[1, 2, 3], [4, 5]]) == [1, 2, 3, 4, 5]);
--------------------
+/
ElementEncodingType!(ElementType!RoR)[] join(RoR, R)(RoR ror, R sep)
if(isInputRange!RoR &&
isInputRange!(ElementType!RoR) &&
isForwardRange!R &&
is(Unqual!(ElementType!(ElementType!RoR)) == Unqual!(ElementType!R)))
{
return joinImpl(ror, sep);
}
/// Ditto
ElementEncodingType!(ElementType!RoR)[] join(RoR)(RoR ror)
if(isInputRange!RoR && isInputRange!(ElementType!RoR))
{
return joinImpl(ror);
}
//Verify Examples.
unittest
{
assert(join(["hello", "silly", "world"], " ") == "hello silly world");
assert(join(["hello", "silly", "world"]) == "hellosillyworld");
assert(join([[1, 2, 3], [4, 5]], [72, 73]) == [1, 2, 3, 72, 73, 4, 5]);
assert(join([[1, 2, 3], [4, 5]]) == [1, 2, 3, 4, 5]);
}
// We have joinImpl instead of just making them all join in order to simplify
// the template constraint that the user will see on errors (it's condensed down
// to the conditions that are common to all).
ElementEncodingType!(ElementType!RoR)[] joinImpl(RoR, R)(RoR ror, R sep)
if(isInputRange!RoR &&
isInputRange!(ElementType!RoR) &&
!isDynamicArray!(ElementType!RoR) &&
@ -1210,7 +1240,7 @@ ElementEncodingType!(ElementType!RoR)[] join(RoR, R)(RoR ror, R sep)
return copy(iter, appender!(typeof(return))).data;
}
ElementEncodingType!(ElementType!RoR)[] join(RoR, R)(RoR ror, R sep)
ElementEncodingType!(ElementType!RoR)[] joinImpl(RoR, R)(RoR ror, R sep)
if(isForwardRange!RoR &&
hasLength!RoR &&
isDynamicArray!(ElementType!RoR) &&
@ -1245,7 +1275,7 @@ ElementEncodingType!(ElementType!RoR)[] join(RoR, R)(RoR ror, R sep)
return cast(RetType)result;
}
ElementEncodingType!(ElementType!RoR)[] join(RoR, R)(RoR ror, R sep)
ElementEncodingType!(ElementType!RoR)[] joinImpl(RoR, R)(RoR ror, R sep)
if(isInputRange!RoR &&
((isForwardRange!RoR && !hasLength!RoR) || !isForwardRange!RoR) &&
isDynamicArray!(ElementType!RoR) &&
@ -1282,8 +1312,7 @@ ElementEncodingType!(ElementType!RoR)[] join(RoR, R)(RoR ror, R sep)
return result.data[0 .. $ - sep.length];
}
/// Ditto
ElementEncodingType!(ElementType!RoR)[] join(RoR)(RoR ror)
ElementEncodingType!(ElementType!RoR)[] joinImpl(RoR)(RoR ror)
if(isInputRange!RoR &&
isInputRange!(ElementType!RoR) &&
!isDynamicArray!(ElementType!RoR))
@ -1303,7 +1332,7 @@ ElementEncodingType!(ElementType!RoR)[] join(RoR)(RoR ror)
return copy(iter, appender!(typeof(return))).data;
}
ElementEncodingType!(ElementType!RoR)[] join(RoR)(RoR ror)
ElementEncodingType!(ElementType!RoR)[] joinImpl(RoR)(RoR ror)
if(isForwardRange!RoR &&
hasLength!RoR &&
isDynamicArray!(ElementType!RoR))
@ -1327,7 +1356,7 @@ ElementEncodingType!(ElementType!RoR)[] join(RoR)(RoR ror)
return cast(RetType)result;
}
ElementEncodingType!(ElementType!RoR)[] join(RoR)(RoR ror)
ElementEncodingType!(ElementType!RoR)[] joinImpl(RoR)(RoR ror)
if(isInputRange!RoR &&
((isForwardRange!RoR && !hasLength!RoR) || !isForwardRange!RoR) &&
isDynamicArray!(ElementType!RoR))
@ -1343,16 +1372,6 @@ ElementEncodingType!(ElementType!RoR)[] join(RoR)(RoR ror)
return result.data;
}
//Verify Examples.
unittest
{
assert(join(["hello", "silly", "world"], " ") == "hello silly world");
assert(join(["hello", "silly", "world"]) == "hellosillyworld");
assert(join([[1, 2, 3], [4, 5]], [72, 73]) == [1, 2, 3, 72, 73, 4, 5]);
assert(join([[1, 2, 3], [4, 5]]) == [1, 2, 3, 4, 5]);
}
unittest
{
debug(std_array) printf("array.join.unittest\n");
@ -1415,6 +1434,7 @@ unittest
assert(join(cast(int[][])[]).empty);
}
/++
Replace occurrences of $(D from) with $(D to) in $(D subject). Returns a new
array without changing the contents of $(D subject).