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

Simplified the Constructor and Resolver example -

Browse source 
no need for range checks as they are handled in Node itself.
This commit is contained in:
Ferdinand Majerech 2011-10-17 13:13:02 +02:00
parent 548480b06b
commit 009017eef0
10 changed files with 48 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

18
examples/constructor/main.d
View file

@ -46,24 +46,18 @@ Color constructColorScalar(Mark start, Mark end, ref Node node)
Color constructColorMapping(Mark start, Mark end, ref Node node)
{
int r,g,b;
bool error = false;
ubyte r,g,b;
//Might throw if a value is missing or is not an integer.
//Might throw if a value is missing is not an integer, or is out of range.
try
{
r = node["r"].get!int;
g = node["g"].get!int;
b = node["b"].get!int;
r = node["r"].get!ubyte;
g = node["g"].get!ubyte;
b = node["b"].get!ubyte;
}
catch(NodeException e)
{
error = true;
}
if(error || r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255)
{
throw new ConstructorException("Invalid color", start, end);
throw new ConstructorException("Invalid color: " ~ e.msg, start, end);
}
return Color(cast(ubyte)r, cast(ubyte)g, cast(ubyte)b);

18
examples/resolver/main.d
View file

@ -46,24 +46,18 @@ Color constructColorScalar(Mark start, Mark end, ref Node node)
Color constructColorMapping(Mark start, Mark end, ref Node node)
{
int r,g,b;
bool error = false;
ubyte r,g,b;
//Might throw if a value is missing or is not an integer.
//Might throw if a value is missing is not an integer, or is out of range.
try
{
r = node["r"].get!int;
g = node["g"].get!int;
b = node["b"].get!int;
r = node["r"].get!ubyte;
g = node["g"].get!ubyte;
b = node["b"].get!ubyte;
}
catch(NodeException e)
{
error = true;
}
if(error || r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255)
{
throw new ConstructorException("Invalid color", start, end);
throw new ConstructorException("Invalid color: " ~ e.msg, start, end);
}
return Color(cast(ubyte)r, cast(ubyte)g, cast(ubyte)b);