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

scanFlowScalar is now nothrow and only does one GC allocation.

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

21
source/dyaml/scanner.d
View file

@ -718,8 +718,10 @@ final class Scanner
//No simple keys after flow scalars.
allowSimpleKey_ = false;
//Scan and add SCALAR.
tokens_.push(scanFlowScalar(quotes));
// Scan and add SCALAR.
const scalar = scanFlowScalar(quotes);
throwIfError();
tokens_.push(scalar);
}
///Aliases to add single or double quoted block scalar.
@ -1282,24 +1284,25 @@ final class Scanner
}
/// Scan a qouted flow scalar token with specified quotes.
Token scanFlowScalar(const ScalarStyle quotes) @trusted pure
///
/// In case of an error, error_ is set. Check this before using the result.
Token scanFlowScalar(const ScalarStyle quotes) @trusted pure nothrow
{
const startMark = reader_.mark;
const quote = reader_.get();
reader_.sliceBuilder.begin();
//XXX remove once nothrow
scope(failure) { reader_.sliceBuilder.finish(); }
scope(exit) { if(error_) {reader_.sliceBuilder.finish();}}
scope(exit) if(error_) { reader_.sliceBuilder.finish(); }
scanFlowScalarNonSpacesToSlice(quotes, startMark);
throwIfError();
if(error_) { return Token.init; }
while(reader_.peek() != quote)
{
scanFlowScalarSpacesToSlice(startMark);
throwIfError();
if(error_) { return Token.init; }
scanFlowScalarNonSpacesToSlice(quotes, startMark);
throwIfError();
if(error_) { return Token.init; }
}
reader_.forward();