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

make Node.mappingKeys and Node.mappingValues const-friendly too

Browse source
This commit is contained in:
Cameron Ross 2018-04-10 03:45:51 -03:00
parent fd50e2cefc
commit 12494a7a78
No known key found for this signature in database
GPG key ID: 777897D98DC91C54
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/dyaml/node.d
View file

@ -1223,7 +1223,7 @@ struct Node
* Throws: NodeException if the nodes is not a mapping or an element * Throws: NodeException if the nodes is not a mapping or an element
* could not be converted to specified type. * could not be converted to specified type.
*/ */
auto mappingKeys(K = Node)() auto mappingKeys(K = Node)() const
{ {
enforce(isMapping, enforce(isMapping,
new NodeException("Trying to 'mappingKeys'-iterate over a " new NodeException("Trying to 'mappingKeys'-iterate over a "
@ -1242,7 +1242,11 @@ struct Node
m1["foo"] = 2; m1["foo"] = 2;
m1["bar"] = 3; m1["bar"] = 3;
assert(m1.mappingKeys.equal(["foo", "bar"])); assert(m1.mappingKeys.equal(["foo", "bar"]) || m1.mappingKeys.equal(["bar", "foo"]));
const cm1 = Node(["foo": 2, "bar": 3]);
assert(cm1.mappingKeys.equal(["foo", "bar"]) || cm1.mappingKeys.equal(["bar", "foo"]));
} }
/** Return a range object iterating over mapping's values. /** Return a range object iterating over mapping's values.
@ -1253,7 +1257,7 @@ struct Node
* Throws: NodeException if the nodes is not a mapping or an element * Throws: NodeException if the nodes is not a mapping or an element
* could not be converted to specified type. * could not be converted to specified type.
*/ */
auto mappingValues(V = Node)() auto mappingValues(V = Node)() const
{ {
enforce(isMapping, enforce(isMapping,
new NodeException("Trying to 'mappingValues'-iterate over a " new NodeException("Trying to 'mappingValues'-iterate over a "
@ -1272,7 +1276,11 @@ struct Node
m1["foo"] = 2; m1["foo"] = 2;
m1["bar"] = 3; m1["bar"] = 3;
assert(m1.mappingValues.equal([2, 3])); assert(m1.mappingValues.equal([2, 3]) || m1.mappingValues.equal([3, 2]));
const cm1 = Node(["foo": 2, "bar": 3]);
assert(cm1.mappingValues.equal([2, 3]) || cm1.mappingValues.equal([3, 2]));
} }