debian-packages/dyaml
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

validateUTF8NoGC now calculates the number of characters in passed string.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-29 23:21:07 +02:00
parent ffef7bf6fc
commit 74c161c576
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/dyaml/nogcutil.d
View file

@ -231,6 +231,8 @@ struct ValidateResult
{ {
/// Is the validated string valid? /// Is the validated string valid?
bool valid; bool valid;
/// Number of characters in the string.
size_t characterCount;
/// If the string is not valid, error message with details is here. /// If the string is not valid, error message with details is here.
string msg; string msg;
/// If the string is not valid, the first invalid sequence of bytes is here. /// If the string is not valid, the first invalid sequence of bytes is here.
@ -252,11 +254,13 @@ private:
ValidateResult validateUTF8NoGC(const(char[]) str) @trusted pure nothrow @nogc ValidateResult validateUTF8NoGC(const(char[]) str) @trusted pure nothrow @nogc
{ {
immutable len = str.length; immutable len = str.length;
size_t characterCount;
outer: for (size_t index = 0; index < len; ) outer: for (size_t index = 0; index < len; )
{ {
if(str[index] < 0x80) if(str[index] < 0x80)
{ {
index++; ++index;
++characterCount;
continue; continue;
} }
@ -329,6 +333,7 @@ ValidateResult validateUTF8NoGC(const(char[]) str) @trusted pure nothrow @nogc
if (!isValidDchar(d)) { return invalidUTF(pstr[0 .. length]); } if (!isValidDchar(d)) { return invalidUTF(pstr[0 .. length]); }
} }
++characterCount;
index += i + 1; index += i + 1;
static if(i == 3) static if(i == 3)
{ {
@ -341,7 +346,7 @@ ValidateResult validateUTF8NoGC(const(char[]) str) @trusted pure nothrow @nogc
return invalidUTF(pstr[0 .. length]); return invalidUTF(pstr[0 .. length]);
} }
return ValidateResult(true); return ValidateResult(true, characterCount);
} }
/// @nogc version of std.utf.decode() for (char[]), but assumes str is valid UTF-8. /// @nogc version of std.utf.decode() for (char[]), but assumes str is valid UTF-8.