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

scanAlphaNumeric, scanDirectiveName are now nothrow @nogc.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-26 12:50:58 +02:00
parent e256d4c004
commit 33110e295e
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/dyaml/scanner.d
View file

@ -837,16 +837,23 @@ final class Scanner
/// ///
/// Assumes that the caller is building a slice in Reader, and puts the scanned /// Assumes that the caller is building a slice in Reader, and puts the scanned
/// characters into that slice. /// characters into that slice.
void scanAlphaNumericToSlice(string name)(const Mark startMark) @system pure ///
/// In case of an error, error_ is set. Use throwIfError() to handle this.
void scanAlphaNumericToSlice(string name)(const Mark startMark)
@system pure nothrow @nogc
{ {
size_t length = 0; size_t length = 0;
dchar c = reader_.peek(); dchar c = reader_.peek();
while(c.isAlphaNum || "-_"d.canFind(c)) { c = reader_.peek(++length); } while(c.isAlphaNum || "-_"d.canFind(c)) { c = reader_.peek(++length); }
enforce(length > 0, if(length == 0)
new Error("While scanning " ~ name, startMark, {
"expected alphanumeric, - or _, but found " ~ c.to!string, enum contextMsg = "While scanning " ~ name;
reader_.mark)); setError(contextMsg, startMark,
buildMsg("expected alphanumeric, '-' or '_', but found ", c),
reader_.mark);
return;
}
reader_.sliceBuilder.write(reader_.get(length)); reader_.sliceBuilder.write(reader_.get(length));
} }
@ -925,6 +932,7 @@ final class Scanner
{ {
scope(failure) { reader_.sliceBuilder.finish(); } scope(failure) { reader_.sliceBuilder.finish(); }
scanDirectiveNameToSlice(startMark); scanDirectiveNameToSlice(startMark);
throwIfError();
} }
const name = reader_.sliceBuilder.finish(); const name = reader_.sliceBuilder.finish();
const value = name == "YAML" ? scanYAMLDirectiveValue(startMark): const value = name == "YAML" ? scanYAMLDirectiveValue(startMark):
@ -943,15 +951,18 @@ final class Scanner
/// ///
/// Assumes that the caller is building a slice in Reader, and puts the scanned /// Assumes that the caller is building a slice in Reader, and puts the scanned
/// characters into that slice. /// characters into that slice.
void scanDirectiveNameToSlice(const Mark startMark) @system pure ///
/// In case of an error, error_ is set. Use throwIfError() to handle this.
void scanDirectiveNameToSlice(const Mark startMark) @system pure nothrow @nogc
{ {
//Scan directive name. //Scan directive name.
scanAlphaNumericToSlice!"a directive"(startMark); scanAlphaNumericToSlice!"a directive"(startMark);
if(error_) { return; }
enforce(" \0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek()), if(" \0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek())) { return; }
new Error("While scanning a directive", startMark, setError("While scanning a directive", startMark,
"expected alphanumeric, - or _, but found " buildMsg("expected alphanumeric, '-' or '_', but found ", reader_.peek()),
~ reader_.peek().to!string, reader_.mark)); reader_.mark);
} }
///Scan value of a YAML directive token. Returns major, minor version separated by '.'. ///Scan value of a YAML directive token. Returns major, minor version separated by '.'.
@ -1068,6 +1079,7 @@ final class Scanner
scope(failure) { reader_.sliceBuilder.finish(); } scope(failure) { reader_.sliceBuilder.finish(); }
if(i == '*') { scanAlphaNumericToSlice!"an alias"(startMark); } if(i == '*') { scanAlphaNumericToSlice!"an alias"(startMark); }
else { scanAlphaNumericToSlice!"an anchor"(startMark); } else { scanAlphaNumericToSlice!"an anchor"(startMark); }
throwIfError();
} }
const value = reader_.sliceBuilder.finish(); const value = reader_.sliceBuilder.finish();