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

nothrow Node constructors where possible (at the moment)

Browse source
This commit is contained in:
Ferdinand Majerech 2015-06-03 20:30:19 +02:00
parent 0a0e966a26
commit 6d706dd3dc
1 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
source/dyaml/node.d
View file

@ -220,6 +220,14 @@ struct Node
static assert(Value.sizeof <= 24, "Unexpected YAML value size"); static assert(Value.sizeof <= 24, "Unexpected YAML value size");
static assert(Node.sizeof <= 48, "Unexpected YAML node size"); static assert(Node.sizeof <= 48, "Unexpected YAML node size");
// If scalarCtorNothrow!T is true, scalar node ctor from T can be nothrow.
//
// TODO
// Eventually we should simplify this and make all Node constructors except from
// user values nothrow (and think even about those user values). 2014-08-28
enum scalarCtorNothrow(T) =
(is(Unqual!T == string) || isIntegral!T || isFloatingPoint!T) ||
(Value.allowed!T && (!is(Unqual!T == Value) && !isSomeString!T && !isArray!T && !isAssociativeArray!T));
public: public:
/** Construct a Node from a value. /** Construct a Node from a value.
* *
@ -242,22 +250,32 @@ struct Node
* a shortcut, like "!!int". * a shortcut, like "!!int".
*/ */
this(T)(T value, const string tag = null) @trusted this(T)(T value, const string tag = null) @trusted
if (isSomeString!T || (!isArray!T && !isAssociativeArray!T)) if(!scalarCtorNothrow!T && (!isArray!T && !isAssociativeArray!T))
{ {
tag_ = Tag(tag); tag_ = Tag(tag);
// No copyconstruction. // No copyconstruction.
static assert(!is(Unqual!T == Node)); static assert(!is(Unqual!T == Node));
// We can easily convert ints, floats, strings. enum unexpectedType = "Unexpected type in the non-nothrow YAML node constructor";
static if(isIntegral!T) {value_ = Value(cast(long) value);} static if(isSomeString!T) { value_ = Value(value.to!string); }
else static if(isFloatingPoint!T){value_ = Value(cast(real) value);} else static if(is(Unqual!T == Value)) { value_ = Value(value); }
else static if(isSomeString!T) {value_ = Value(to!string(value));} else static if(Value.allowed!T) { static assert(false, unexpectedType); }
// Other directly supported type.
else static if(Value.allowed!T) {value_ = Value(value);}
// User defined type. // User defined type.
else { value_ = userValue(value); } else { value_ = userValue(value); }
} }
/// Ditto.
// Overload for types where we can make this nothrow.
this(T)(T value, const string tag = null) @safe pure nothrow
if(scalarCtorNothrow!T)
{
tag_ = Tag(tag);
// We can easily store ints, floats, strings.
static if(isIntegral!T) { value_ = Value(cast(long)value); }
else static if(isFloatingPoint!T) { value_ = Value(cast(real)value); }
// User defined type or plain string.
else { value_ = Value(value); }
}
unittest unittest
{ {
{ {
@ -272,6 +290,10 @@ struct Node
auto node = Node(new class{int a = 5;}); auto node = Node(new class{int a = 5;});
assert(node.isUserType); assert(node.isUserType);
} }
{
auto node = Node("string");
assert(node.as!string == "string");
}
} }
/** Construct a node from an _array. /** Construct a node from an _array.