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

Merged implementations of Node.remove() and Node.removeAt().

Browse source
This commit is contained in:
Ferdinand Majerech 2012-03-01 17:43:42 +01:00
parent 2505c0b3af
commit d64de6a312
1 changed files with 49 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
dyaml/node.d
View file

@ -817,6 +817,7 @@ struct Node
//Unittest for contains() and containsKey(). //Unittest for contains() and containsKey().
unittest unittest
{ {
writeln("D:YAML Node contains/containsKey unittest");
auto seq = Node([1, 2, 3, 4, 5]); auto seq = Node([1, 2, 3, 4, 5]);
assert(seq.contains(3)); assert(seq.contains(3));
assert(seq.contains(5)); assert(seq.contains(5));
@ -1185,39 +1186,13 @@ struct Node
* If the node is a mapping, the first key-value pair where _value * If the node is a mapping, the first key-value pair where _value
* matches specified value is removed. * matches specified value is removed.
* *
* Params: value = Value to _remove. * Params: rhs = Value to _remove.
* *
* Throws: NodeException if the node is not a collection. * Throws: NodeException if the node is not a collection.
*/ */
void remove(T)(T value) void remove(T)(T rhs)
{ {
if(isSequence()) remove_!(T, No.key, "remove")(rhs);
{
foreach(idx, ref elem; get!(Node[]))
{
if(elem.convertsTo!T &&
elem.as!(T, No.stringConversion) == value)
{
removeAt(idx);
return;
}
}
return;
}
else if(isMapping())
{
const idx = findPair!(T, true)(value);
if(idx >= 0)
{
auto pairs = as!(Node.Pair[])();
moveAll(pairs[idx + 1 .. $], pairs[idx .. $ - 1]);
pairs.length = pairs.length - 1;
value_ = Value(pairs);
}
return;
}
throw new Error("Trying to remove an element from a " ~ nodeTypeString ~ " node",
startMark_);
} }
unittest unittest
{ {
@ -1266,34 +1241,7 @@ struct Node
*/ */
void removeAt(T)(T index) void removeAt(T)(T index)
{ {
if(isSequence()) remove_!(T, Yes.key, "removeAt")(index);
{
//This ensures T is integral.
checkSequenceIndex(index);
static if(isIntegral!T)
{
auto nodes = value_.get!(Node[]);
moveAll(nodes[index + 1 .. $], nodes[index .. $ - 1]);
nodes.length = nodes.length - 1;
value_ = Value(nodes);
return;
}
assert(false);
}
else if(isMapping())
{
const idx = findPair(index);
if(idx >= 0)
{
auto pairs = get!(Node.Pair[])();
moveAll(pairs[idx + 1 .. $], pairs[idx .. $ - 1]);
pairs.length = pairs.length - 1;
value_ = Value(pairs);
}
return;
}
throw new Error("Trying to remove an element from a " ~ nodeTypeString ~ " node",
startMark_);
} }
unittest unittest
{ {
@ -1630,6 +1578,50 @@ struct Node
startMark_); startMark_);
} }
//Implementation of remove() and removeAt()
void remove_(T, Flag!"key" key, string func)(T rhs)
{
enforce(isSequence || isMapping,
new Error("Trying to " ~ func ~ "() from a " ~ nodeTypeString ~ " node",
startMark_));
static void removeElem(E, I)(ref Node node, I index)
{
auto elems = node.value_.get!(E[]);
moveAll(elems[index + 1 .. $], elems[index .. $ - 1]);
elems.length = elems.length - 1;
node.value_ = Value(elems);
}
if(isSequence())
{
static long getIndex(ref Node node, ref T rhs)
{
foreach(idx, ref elem; node.get!(Node[])) with(elem)
{
if(convertsTo!T && as!(T, No.stringConversion) == rhs)
{
return idx;
}
}
return -1;
}
const index = select!key(rhs, getIndex(this, rhs));
//This throws if the index is not integral.
checkSequenceIndex(index);
static if(isIntegral!(typeof(index))){removeElem!Node(this, index);}
else {assert(false, "Non-integral sequence index");}
}
else if(isMapping())
{
const index = findPair!(T, !key)(rhs);
if(index >= 0){removeElem!Pair(this, index);}
}
}
//Get index of pair with key (or value, if value is true) matching index. //Get index of pair with key (or value, if value is true) matching index.
sizediff_t findPair(T, bool value = false)(const ref T index) const sizediff_t findPair(T, bool value = false)(const ref T index) const
{ {