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

Error messages with non-ASCII chars will now show the char, not 'unknown'.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-29 02:00:13 +02:00
parent 7cf9dca57d
commit 5d78e76f6a
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/dyaml/nogcutil.d
View file

@ -119,11 +119,21 @@ char[] writeDCharTo(dchar c, char[] buf) @safe pure nothrow @nogc
} }
/// A UFCS utility function to write a dchar to an AppenderNoGCFixed using writeDCharTo. /// A UFCS utility function to write a dchar to an AppenderNoGCFixed using writeDCharTo.
///
/// The char $(B must) be a valid dchar.
void putDChar(ref AppenderNoGCFixed!(char[], char) appender, dchar c) void putDChar(ref AppenderNoGCFixed!(char[], char) appender, dchar c)
@safe pure nothrow @nogc @safe pure nothrow @nogc
{ {
char[16] dcharBuf; char[4] dcharBuf;
appender.put(c.writeDCharTo(dcharBuf)); if(c < 0x80)
{
dcharBuf[0] = cast(char)c;
appender.put(dcharBuf[0 .. 1]);
return;
}
// Should be safe to use as the first thing Reader does is validate everything.
const bytes = encodeValidCharNoGC(dcharBuf, c);
appender.put(dcharBuf[0 .. bytes]);
} }
/// Convenience function that returns an $(D AppenderNoGCFixed!A) using with $(D array) /// Convenience function that returns an $(D AppenderNoGCFixed!A) using with $(D array)
@ -235,7 +245,7 @@ unittest
appender.put("found unsupported escape character: "); appender.put("found unsupported escape character: ");
appender.putDChar('a'); appender.putDChar('a');
appender.putDChar('á'); appender.putDChar('á');
assert(appender.data == "found unsupported escape character: 'a''unknown'"); assert(appender.data == "found unsupported escape character: 'a''á'");
} }