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

Backported a recent std.utf script.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-08-01 02:47:52 +02:00
parent 6317654d06
commit fdf4cecddb
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/dyaml/nogcutil.d
View file

@ -306,6 +306,8 @@ ValidateResult validateUTF8NoGC(const(char[]) str) @trusted pure nothrow @nogc
} }
assert(fst & 0x80); assert(fst & 0x80);
// starter must have at least 2 first bits set
if((fst & 0b1100_0000) != 0b1100_0000) { return invalidUTF(pstr[0 .. length]); }
ubyte tmp = void; ubyte tmp = void;
dchar d = fst; // upper control bits are masked out later dchar d = fst; // upper control bits are masked out later
fst <<= 1; fst <<= 1;
@ -373,11 +375,13 @@ dchar decodeValidUTF8NoGC(const(char[]) str, ref size_t index)
ubyte fst = pstr[0]; ubyte fst = pstr[0];
assert(fst & 0x80); assert(fst & 0x80);
enum invalidUTFMsg = "Invalid UTF-8 sequence in supposedly validated string";
// starter must have at least 2 first bits set
assert((fst & 0b1100_0000) == 0b1100_0000, invalidUTFMsg);
ubyte tmp = void; ubyte tmp = void;
dchar d = fst; // upper control bits are masked out later dchar d = fst; // upper control bits are masked out later
fst <<= 1; fst <<= 1;
enum invalidUTFMsg = "Invalid UTF-8 sequence in supposedly validated string";
foreach (i; TypeTuple!(1, 2, 3)) foreach (i; TypeTuple!(1, 2, 3))
{ {
assert(i != length, "Decoding out of bounds in supposedly validated UTF-8"); assert(i != length, "Decoding out of bounds in supposedly validated UTF-8");