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

Using printNoGC to simplify @nogc error message building.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-25 16:53:40 +02:00
parent 2420b57281
commit 46255846e6
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/dyaml/scanner.d
View file

@ -27,6 +27,7 @@ import std.utf;
import dyaml.fastcharsearch; import dyaml.fastcharsearch;
import dyaml.escapes; import dyaml.escapes;
import dyaml.exception; import dyaml.exception;
import dyaml.nogcutil;
import dyaml.queue; import dyaml.queue;
import dyaml.reader; import dyaml.reader;
import dyaml.style; import dyaml.style;
@ -1405,7 +1406,6 @@ final class Scanner
dchar[] hex = reader_.get(hexLength); dchar[] hex = reader_.get(hexLength);
bool overflow; bool overflow;
import dyaml.nogcutil;
const decoded = cast(dchar)parseNoGC!int(hex, 16u, overflow); const decoded = cast(dchar)parseNoGC!int(hex, 16u, overflow);
if(overflow) if(overflow)
{ {
@ -1423,23 +1423,10 @@ final class Scanner
} }
else else
{ {
// Build an error message about the unsupported escape character auto msg = msgBuffer_.printNoGC("found unsupported escape "
// without breaking purity or allocating. "character", c);
const msg = "found unsupported escape character: ";
auto msgChars = msg.length;
msgBuffer_[0 .. msgChars] = msg;
if(c > char.max)
{
const unknown = "<unknown>";
msgBuffer_[msgChars .. msgChars + unknown.length] = unknown;
msgChars += unknown.length;
}
else
{
msgBuffer_[msgChars++] = cast(char)c;
}
setError("While scanning a double quoted scalar", startMark, setError("While scanning a double quoted scalar", startMark,
cast(string)msgBuffer_[0 .. msgChars], reader_.mark); cast(string)msg, reader_.mark);
return; return;
} }
} }