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

further refactoring and cleaning up of Node.get

Browse source
This commit is contained in:
Cameron Ross 2018-04-10 05:37:13 -03:00
parent a35536fe59
commit 7ddea9db39
No known key found for this signature in database
GPG key ID: 777897D98DC91C54
1 changed files with 25 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
source/dyaml/node.d
View file

@ -578,13 +578,11 @@ struct Node
/// Must go before others, as even string/int/etc could be stored in a YAMLObject. /// Must go before others, as even string/int/etc could be stored in a YAMLObject.
static if(!allowed!(Unqual!T)) if(isUserType) static if(!allowed!(Unqual!T)) if(isUserType)
{ {
auto object = as!(const YAMLObject); auto object = getValue!YAMLObject();
if(object.type is typeid(T)) enforce(object.type is typeid(T),
{ new NodeException("Node has unexpected type: " ~ object.type.toString() ~
return (cast(inout YAMLContainer!(Unqual!T))(getValue!YAMLObject())).value_; ". Expected: " ~ typeid(T).toString, startMark_));
} return (cast(inout YAMLContainer!(Unqual!T))(object)).value_;
throw new NodeException("Node has unexpected type: " ~ object.type.toString() ~
". Expected: " ~ typeid(T).toString, startMark_);
} }
// If we're getting from a mapping and we're not getting Node.Pair[], // If we're getting from a mapping and we're not getting Node.Pair[],
@ -597,7 +595,7 @@ struct Node
{ {
if(isString){return to!T(getValue!string);} if(isString){return to!T(getValue!string);}
throw new NodeException("Node stores unexpected type: " ~ type.toString() ~ throw new NodeException("Node stores unexpected type: " ~ type.toString() ~
". Expected: " ~ typeid(T).toString(), startMark_); ". Expected: " ~ typeid(T).toString(), startMark_);
} }
else else
{ {
@ -612,36 +610,26 @@ struct Node
} }
} }
} }
else else static if(isFloatingPoint!T)
{ {
static if(isFloatingPoint!T) /// Can convert int to float.
{ if(isInt()) {return to!T(getValue!long);}
/// Can convert int to float. else if(isFloat()){return to!T(getValue!real);}
if(isInt()) {return to!T(getValue!long);}
else if(isFloat()){return to!T(getValue!real);}
}
else static if(is(Unqual!T == bool))
{
auto temp = getValue!bool;
return to!bool(temp);
}
else static if(isIntegral!T)
{
if(isInt())
{
immutable temp = getValue!long;
enforce(temp >= T.min && temp <= T.max,
new NodeException("Integer value of type " ~ typeid(T).toString() ~
" out of range. Value: " ~ to!string(temp), startMark_));
return temp.to!T;
}
throw new NodeException("Node stores unexpected type: " ~ type.toString() ~
". Expected: " ~ typeid(T).toString, startMark_);
}
else throw new NodeException("Node stores unexpected type: " ~ type.toString() ~ else throw new NodeException("Node stores unexpected type: " ~ type.toString() ~
". Expected: " ~ typeid(T).toString, startMark_); ". Expected: " ~ typeid(T).toString, startMark_);
} }
assert(false, "This code should never be reached"); else static if(isIntegral!T)
{
enforce(isInt(), new NodeException("Node stores unexpected type: " ~ type.toString() ~
". Expected: " ~ typeid(T).toString, startMark_));
immutable temp = getValue!long;
enforce(temp >= T.min && temp <= T.max,
new NodeException("Integer value of type " ~ typeid(T).toString() ~
" out of range. Value: " ~ to!string(temp), startMark_));
return temp.to!T;
}
else throw new NodeException("Node stores unexpected type: " ~ type.toString() ~
". Expected: " ~ typeid(T).toString, startMark_);
} }
/// Automatic type conversion /// Automatic type conversion
@safe unittest @safe unittest
@ -655,6 +643,8 @@ struct Node
@safe unittest @safe unittest
{ {
assertThrown!NodeException(Node("42").get!int); assertThrown!NodeException(Node("42").get!int);
assertThrown!NodeException(Node("42").get!double);
assertThrown!NodeException(Node(long.max).get!ushort);
Node(YAMLNull()).get!YAMLNull; Node(YAMLNull()).get!YAMLNull;
} }
@safe unittest @safe unittest