Merge branch 'master' of github.com:kiith-sa/D-YAML

This commit is contained in:
kiith-sa 2012-11-02 14:33:09 +01:00
commit 499ce02178

View file

@ -94,7 +94,7 @@ final class Scanner
///Index of the key token from start (first token scanned being 0). ///Index of the key token from start (first token scanned being 0).
uint tokenIndex; uint tokenIndex;
///Line the key starts at. ///Line the key starts at.
ushort line; uint line;
///Column the key starts at. ///Column the key starts at.
ushort column; ushort column;
///Is this required to be a simple key? ///Is this required to be a simple key?
@ -345,7 +345,7 @@ final class Scanner
const column = reader_.column; const column = reader_.column;
const key = SimpleKey(cast(uint)reader_.charIndex, const key = SimpleKey(cast(uint)reader_.charIndex,
tokenCount, tokenCount,
line < ushort.max ? cast(ushort)line : ushort.max, line,
column < ushort.max ? cast(ushort)column : ushort.max, column < ushort.max ? cast(ushort)column : ushort.max,
required); required);