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

UTF-8 scanAnchor.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-29 03:09:59 +02:00
parent 2a524bbb5e
commit 1cc07c263a
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/dyaml/scanner.d
View file

@ -1115,16 +1115,16 @@ final class Scanner
/// Therefore we restrict aliases to ASCII alphanumeric characters. /// Therefore we restrict aliases to ASCII alphanumeric characters.
/// ///
/// In case of an error, error_ is set. Use throwIfError() to handle this. /// In case of an error, error_ is set. Use throwIfError() to handle this.
Token scanAnchor(const TokenID id) @trusted pure nothrow Token scanAnchor(const TokenID id) @trusted pure nothrow @nogc
{ {
const startMark = reader_.mark; const startMark = reader_.mark;
const dchar i = reader_.get(); const dchar i = reader_.get();
reader_.sliceBuilder.begin(); reader_.sliceBuilder8.begin();
if(i == '*') { scanAlphaNumericToSlice!"an alias"(startMark); } if(i == '*') { scanAlphaNumericToSlice8!"an alias"(startMark); }
else { scanAlphaNumericToSlice!"an anchor"(startMark); } else { scanAlphaNumericToSlice8!"an anchor"(startMark); }
// On error, value is discarded as we return immediately // On error, value is discarded as we return immediately
const value = reader_.sliceBuilder.finish(); const value = reader_.sliceBuilder8.finish();
if(error_) { return Token.init; } if(error_) { return Token.init; }
if(!" \t\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek()) && if(!" \t\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek()) &&
@ -1139,11 +1139,11 @@ final class Scanner
if(id == TokenID.Alias) if(id == TokenID.Alias)
{ {
return aliasToken(startMark, reader_.mark, value.utf32To8); return aliasToken(startMark, reader_.mark, value);
} }
if(id == TokenID.Anchor) if(id == TokenID.Anchor)
{ {
return anchorToken(startMark, reader_.mark, value.utf32To8); return anchorToken(startMark, reader_.mark, value);
} }
assert(false, "This code should never be reached"); assert(false, "This code should never be reached");
} }