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

scanFlowScalarNonSpaces is now nothrow @nogc.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-24 23:21:07 +02:00
parent 48f31d6971
commit a59a34ffce
1 changed files with 37 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
source/dyaml/scanner.d
View file

@ -1314,15 +1314,15 @@ final class Scanner
/// ///
/// In case of an error, error_ is set. Check this before using the result. /// In case of an error, error_ is set. Check this before using the result.
void scanFlowScalarNonSpacesToSlice(const ScalarStyle quotes, const Mark startMark) void scanFlowScalarNonSpacesToSlice(const ScalarStyle quotes, const Mark startMark)
@system pure @system pure nothrow @nogc
{ {
for(;;) with(ScalarStyle) for(;;) with(ScalarStyle)
{ {
dchar c = reader_.peek(); dchar c = reader_.peek();
uint length = 0;
mixin FastCharSearch!" \t\0\n\r\u0085\u2028\u2029\'\"\\"d search; mixin FastCharSearch!" \t\0\n\r\u0085\u2028\u2029\'\"\\"d search;
size_t length = 0;
// This is an optimized way of writing: // This is an optimized way of writing:
// while(!search.canFind(reader_.peek(length))){++length;} // while(!search.canFind(reader_.peek(length))){++length;}
outer: for(;;) outer: for(;;)
@ -1359,29 +1359,35 @@ final class Scanner
{ {
reader_.forward(); reader_.forward();
c = reader_.peek(); c = reader_.peek();
if((c in dyaml.escapes.fromEscapes) !is null) if(dyaml.escapes.escapes.canFind(c))
{ {
reader_.forward(); reader_.forward();
// This works because fromEscapes is dchar[dchar] - we use at reader_.sliceBuilder.write(dyaml.escapes.fromEscape(c));
// most the space freed by the forward() call above.
reader_.sliceBuilder.write(dyaml.escapes.fromEscapes[c]);
} }
else if((c in dyaml.escapes.escapeHexCodes) !is null) else if(dyaml.escapes.escapeHexCodeList.canFind(c))
{ {
length = dyaml.escapes.escapeHexCodes[c]; const hexLength = dyaml.escapes.escapeHexLength(c);
reader_.forward(); reader_.forward();
foreach(i; 0 .. length) if(!reader_.peek(i).isHexDigit()) foreach(i; 0 .. hexLength) if(!reader_.peek(i).isHexDigit())
{ {
setError("While scanning a double qouted scalar", startMark, setError("While scanning a double quoted scalar", startMark,
"expected escape sequence of " ~ length.to!string ~ "found an unexpected character; expected escape "
" hexadecimal numbers, but found " ~ "sequence of hexadecimal numbers.", reader_.mark);
reader_.peek(i).to!string, reader_.mark);
return; return;
} }
dchar[] hex = reader_.get(length); dchar[] hex = reader_.get(hexLength);
reader_.sliceBuilder.write(cast(dchar)parse!int(hex, 16)); bool overflow;
import dyaml.nogcutil;
const decoded = cast(dchar)parseNoGC!int(hex, 16u, overflow);
if(overflow)
{
setError("While scanning a double quoted scalar", startMark,
"overflow when parsing an escape sequence of "
"hexadecimal numbers.", reader_.mark);
}
reader_.sliceBuilder.write(decoded);
} }
else if("\n\r\u0085\u2028\u2029"d.canFind(c)) else if("\n\r\u0085\u2028\u2029"d.canFind(c))
{ {
@ -1391,9 +1397,23 @@ final class Scanner
} }
else else
{ {
// Build an error message about the unsupported escape character
// without breaking purity or allocating.
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,
"found unknown escape character: " ~ c.to!string, cast(string)msgBuffer_[0 .. msgChars], reader_.mark);
reader_.mark);
return; return;
} }
} }