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

Removed the Error and ErrorData aliases.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-26 23:31:13 +02:00
parent 2e7de5f9ed
commit ebe10ad8c4
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/dyaml/scanner.d
View file

@ -63,9 +63,6 @@ class ScannerException : MarkedYAMLException
mixin MarkedExceptionCtors; mixin MarkedExceptionCtors;
} }
private alias ScannerException Error;
private alias MarkedYAMLExceptionData ErrorData;
/// Generates tokens from data provided by a Reader. /// Generates tokens from data provided by a Reader.
final class Scanner final class Scanner
{ {
@ -146,7 +143,7 @@ final class Scanner
bool error_; bool error_;
/// Data for the exception to throw if error_ is true. /// Data for the exception to throw if error_ is true.
ErrorData errorData_; MarkedYAMLExceptionData errorData_;
/// Error messages can be built in this buffer without using the GC. /// Error messages can be built in this buffer without using the GC.
/// ///
@ -394,8 +391,9 @@ final class Scanner
{ {
const key = possibleSimpleKeys_[flowLevel_]; const key = possibleSimpleKeys_[flowLevel_];
enforce(!key.required, enforce(!key.required,
new Error("While scanning a simple key", Mark(key.line, key.column), new ScannerException("While scanning a simple key",
"could not find expected ':'", reader_.mark)); Mark(key.line, key.column),
"could not find expected ':'", reader_.mark));
possibleSimpleKeys_[flowLevel_].isNull = true; possibleSimpleKeys_[flowLevel_].isNull = true;
} }
} }
@ -414,13 +412,13 @@ final class Scanner
// key : { // key : {
// } // }
//In the flow context, indentation is ignored. We make the scanner less // In the flow context, indentation is ignored. We make the scanner less
//restrictive than what the specification requires. // restrictive than what the specification requires.
//if(pedantic_ && flowLevel_ > 0 && indent_ > column) // if(pedantic_ && flowLevel_ > 0 && indent_ > column)
//{ // {
// throw new Error("Invalid intendation or unclosed '[' or '{'", // throw new ScannerException("Invalid intendation or unclosed '[' or '{'",
// reader_.mark) // reader_.mark)
//} // }
return; return;
} }
@ -554,9 +552,9 @@ final class Scanner
/// id = Token type we might need to add. /// id = Token type we might need to add.
void blockChecks(string type, TokenID id)() @safe void blockChecks(string type, TokenID id)() @safe
{ {
//Are we allowed to start a key (not neccesarily a simple one)? enum context = type ~ " keys are not allowed here";
enforce(allowSimpleKey_, new Error(type ~ " keys are not allowed here", // Are we allowed to start a key (not neccesarily a simple one)?
reader_.mark)); enforce(allowSimpleKey_, new ScannerException(context, reader_.mark));
if(addIndent(reader_.column)) if(addIndent(reader_.column))
{ {
@ -629,7 +627,7 @@ final class Scanner
{ {
// We can start a complex value if and only if we can start a simple key. // We can start a complex value if and only if we can start a simple key.
enforce(flowLevel_ > 0 || allowSimpleKey_, enforce(flowLevel_ > 0 || allowSimpleKey_,
new Error("Mapping values are not allowed here", reader_.mark)); new ScannerException("Mapping values are not allowed here", reader_.mark));
// If this value starts a new block mapping, we need to add // If this value starts a new block mapping, we need to add
// BLOCK-MAPPING-START. It'll be detected as an error later by the parser. // BLOCK-MAPPING-START. It'll be detected as an error later by the parser.