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

Merge pull request #6743 from n8sh/string-template-antibloat

Browse source 
Decrease template bloat for string functions
merged-on-behalf-of: Jonathan M Davis <jmdavis@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2018-11-19 04:57:44 +01:00 • committed by GitHub
commit 8cef7b563e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
std/string.d
View file

@ -219,7 +219,7 @@ class StringException : Exception
$(RED Important Note:) The returned array is a slice of the original buffer.
The original data is not changed and not copied.
+/
Char[] fromStringz(Char)(Char* cString) @nogc @system pure nothrow
inout(Char)[] fromStringz(Char)(return scope inout(Char)* cString) @nogc @system pure nothrow
if (isSomeChar!Char)
{
import core.stdc.stddef : wchar_t;
@ -229,7 +229,7 @@ if (isSomeChar!Char)
else static if (is(Unqual!Char == wchar_t))
import core.stdc.wchar_ : cstrlen = wcslen;
else
static size_t cstrlen(const Char* s)
static size_t cstrlen(scope const Char* s)
{
const(Char)* p = s;
while (*p)
@ -432,7 +432,7 @@ if (isInputRange!Range && isSomeChar!(ElementType!Range) && !isSomeString!Range)
}
/// Ditto
ptrdiff_t indexOf(C)(C[] s, dchar c, CaseSensitive cs = Yes.caseSensitive)
ptrdiff_t indexOf(C)(scope const(C)[] s, dchar c, CaseSensitive cs = Yes.caseSensitive)
if (isSomeChar!C)
{
return _indexOf(s, c, cs);
@ -446,7 +446,7 @@ if (isInputRange!Range && isSomeChar!(ElementType!Range) && !isSomeString!Range)
}
/// Ditto
ptrdiff_t indexOf(C)(C[] s, dchar c, size_t startIdx, CaseSensitive cs = Yes.caseSensitive)
ptrdiff_t indexOf(C)(scope const(C)[] s, dchar c, size_t startIdx, CaseSensitive cs = Yes.caseSensitive)
if (isSomeChar!C)
{
return _indexOf(s, c, startIdx, cs);
@ -5300,7 +5300,7 @@ if (isSomeChar!C1 && isSomeString!S && isSomeChar!C2)
toRemove = The characters to remove from the string.
buffer = An output range to write the contents to.
+/
void translate(C1, C2 = immutable char, Buffer)(C1[] str,
void translate(C1, C2 = immutable char, Buffer)(const(C1)[] str,
in dchar[dchar] transTable,
const(C2)[] toRemove,
Buffer buffer)
@ -5356,7 +5356,7 @@ if (isSomeChar!C1 && isSomeString!S && isSomeChar!C2 && isOutputRange!(Buffer, S
translateImpl(str, transTable, toRemove, buffer);
}
private void translateImpl(C1, T, C2, Buffer)(C1[] str,
private void translateImpl(C1, T, C2, Buffer)(const(C1)[] str,
T transTable,
const(C2)[] toRemove,
Buffer buffer)