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

Use of throwIfError for handling scanPlain errors.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-24 18:43:33 +02:00
parent 60c3079f11
commit 45d8db08d1
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/dyaml/scanner.d
View file

@ -717,25 +717,21 @@ final class Scanner
alias fetchFlowScalar!(ScalarStyle.SingleQuoted) fetchSingle; alias fetchFlowScalar!(ScalarStyle.SingleQuoted) fetchSingle;
alias fetchFlowScalar!(ScalarStyle.DoubleQuoted) fetchDouble; alias fetchFlowScalar!(ScalarStyle.DoubleQuoted) fetchDouble;
///Add plain SCALAR token. /// Add plain SCALAR token.
void fetchPlain() @trusted void fetchPlain() @trusted
{ {
//A plain scalar could be a simple key // A plain scalar could be a simple key
savePossibleSimpleKey(); savePossibleSimpleKey();
//No simple keys after plain scalars. But note that scanPlain() will // No simple keys after plain scalars. But note that scanPlain() will
//change this flag if the scan is finished at the beginning of the line. // change this flag if the scan is finished at the beginning of the line.
allowSimpleKey_ = false; allowSimpleKey_ = false;
const plain = scanPlain(); const plain = scanPlain();
if(error_) throwIfError();
{
error_ = false; // Scan and add SCALAR. May change allowSimpleKey_
throw new Error(errorData_);
}
//Scan and add SCALAR. May change allowSimpleKey_
tokens_.push(plain); tokens_.push(plain);
} }
///Check if the next token is DIRECTIVE: ^ '%' ... ///Check if the next token is DIRECTIVE: ^ '%' ...
bool checkDirective() @safe pure nothrow @nogc bool checkDirective() @safe pure nothrow @nogc
{ {