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

Fix for bugzilla 5366

Browse source
This commit is contained in:
Iain Buclaw 2011-01-12 02:38:02 +00:00
parent 461e22c923
commit 9f51068a74
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
std/json.d
View file

@ -156,7 +156,7 @@ JSONValue parseJSON(T)(T json, int maxDepth = -1) if(isInputRange!T) {
foreach_reverse(i; 0 .. 4) { foreach_reverse(i; 0 .. 4) {
auto hex = toupper(getChar()); auto hex = toupper(getChar());
if(!isxdigit(hex)) error("Expecting hex character"); if(!isxdigit(hex)) error("Expecting hex character");
val += (isdigit(hex) ? hex - '0' : hex - 'A') << (4 * i); val += (isdigit(hex) ? hex - '0' : hex - ('A' - 10)) << (4 * i);
} }
char[4] buf = void; char[4] buf = void;
str.put(toUTF8(buf, val)); str.put(toUTF8(buf, val));
@ -461,4 +461,12 @@ unittest {
writefln(text(json, "\n", e.toString())); writefln(text(json, "\n", e.toString()));
} }
} }
// Should be able to correctly interpret unicode entities
val = parseJSON(`"\u003C\u003E"`);
assert(toJSON(&val) == "\"\&lt;\&gt;\"");
val = parseJSON(`"\u0391\u0392\u0393"`);
assert(toJSON(&val) == "\"\&Alpha;\&Beta;\&Gamma;\"");
val = parseJSON(`"\u2660\u2666"`);
assert(toJSON(&val) == "\"\&spades;\&diams;\"");
} }