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

scanURIEscapesToSlice now returns the number of scanned characters.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-25 02:49:33 +02:00
parent 817dc3b610
commit 7865e0b480
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
source/dyaml/scanner.d
View file

@ -1736,40 +1736,48 @@ final class Scanner
} }
/// Scan URI escape sequences. /// Scan URI escape sequences.
void scanURIEscapesToSlice(const string name, const Mark startMark) @system pure ///
/// Assumes that the caller is building a slice in Reader, and puts the scanned
/// characters into that slice.
///
/// Returns: true if any escapes were scanned, false otherwise.
bool scanURIEscapesToSlice(const string name, const Mark startMark) @system pure
{ {
// URI escapes encode a UTF-8 string. We store UTF-8 code units here for // URI escapes encode a UTF-8 string. We store UTF-8 code units here for
// decoding into UTF-32. // decoding into UTF-32.
char[4] bytes; char[4] bytes;
size_t bytesUsed; size_t bytesUsed;
Mark mark = reader_.mark; Mark mark = reader_.mark;
// True if any characters were written to the slice.
bool anyChars;
// Get one dchar by decoding data from bytes. // Get one dchar by decoding data from bytes.
// //
// This is probably slow, but simple and URI escapes are extremely uncommon // This is probably slow, but simple and URI escapes are extremely uncommon
// in YAML. // in YAML.
static size_t getDchar(char[] bytes, Reader reader_) static size_t getDchar(char[] bytes, Reader reader_, ref bool anyChars)
{ {
import std.utf; import std.utf;
size_t nextChar; size_t nextChar;
const c = std.utf.decode(bytes[], nextChar); const c = std.utf.decode(bytes[], nextChar);
reader_.sliceBuilder.write(c); reader_.sliceBuilder.write(c);
anyChars = true;
if(bytes.length - nextChar > 0) if(bytes.length - nextChar > 0)
{ {
core.stdc.string.memmove(bytes.ptr, bytes.ptr + nextChar, core.stdc.string.memmove(bytes.ptr, bytes.ptr + nextChar,
bytes.length - nextChar); bytes.length - nextChar);
} }
return bytes.length - nextChar; return bytes.length - nextChar;
} }
try try
{ {
while(reader_.peek() == '%') while(reader_.peek() == '%')
{ {
reader_.forward(); reader_.forward();
if(bytesUsed == bytes.length) if(bytesUsed == bytes.length)
{ {
bytesUsed = getDchar(bytes[], reader_); bytesUsed = getDchar(bytes[], reader_, anyChars);
} }
char b = 0; char b = 0;
@ -1797,12 +1805,14 @@ final class Scanner
reader_.forward(2); reader_.forward(2);
} }
bytesUsed = getDchar(bytes[0 .. bytesUsed], reader_); bytesUsed = getDchar(bytes[0 .. bytesUsed], reader_, anyChars);
} }
catch(UTFException e) catch(UTFException e)
{ {
throw new Error("While scanning a " ~ name, startMark, e.msg, mark); throw new Error("While scanning a " ~ name, startMark, e.msg, mark);
} }
return anyChars;
} }