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

yaml_gen should no longer generate maps/omaps with duplicate keys.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-08-02 23:28:33 +02:00
parent 0d89c2beb1
commit 85b89d3323
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
examples/yaml_gen/yaml_gen.d
View file

@ -199,7 +199,12 @@ Node pairs(bool root, bool complex, Node range, string tag)
{ {
while(!(totalNodes >= minNodesDocument)) while(!(totalNodes >= minNodesDocument))
{ {
keys ~= generateNode(randomType(typesScalarKey ~ (complex ? typesCollection : []))); const key = generateNode(randomType(typesScalarKey ~ (complex ? typesCollection : [])));
// Maps can't contain duplicate keys
if(tag.endsWith("map") && keys.canFind(key)) { continue; }
keys.assumeSafeAppend;
values.assumeSafeAppend;
keys ~= key;
values ~= generateNode(randomType(typesScalar ~ typesCollection)); values ~= generateNode(randomType(typesScalar ~ typesCollection));
} }
} }
@ -210,9 +215,15 @@ Node pairs(bool root, bool complex, Node range, string tag)
keys = new Node[pairs]; keys = new Node[pairs];
values = new Node[pairs]; values = new Node[pairs];
foreach(i; 0 .. pairs) outer: foreach(i; 0 .. pairs)
{ {
keys[i] = generateNode(randomType(typesScalarKey ~ (complex ? typesCollection : []))); auto key = generateNode(randomType(typesScalarKey ~ (complex ? typesCollection : [])));
// Maps can't contain duplicate keys
while(tag.endsWith("map") && keys[0 .. i].canFind(key))
{
key = generateNode(randomType(typesScalarKey ~ (complex ? typesCollection : [])));
}
keys[i] = key;
values[i] = generateNode(randomType(typesScalar ~ typesCollection)); values[i] = generateNode(randomType(typesScalar ~ typesCollection));
} }
} }