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

massive speed increase for mapping construction

Browse source
This commit is contained in:
Cameron Ross 2018-04-18 15:21:13 -03:00 committed by BBasile
parent fbca742f86
commit 0bea335f57
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/dyaml/composer.d
View file

@ -12,9 +12,11 @@ module dyaml.composer;
import core.memory; import core.memory;
import std.algorithm;
import std.array; import std.array;
import std.conv; import std.conv;
import std.exception; import std.exception;
import std.range;
import std.typecons; import std.typecons;
import dyaml.constructor; import dyaml.constructor;
@ -314,12 +316,12 @@ final class Composer
else else
{ {
auto temp = Node.Pair(key, value); auto temp = Node.Pair(key, value);
merge(*pairAppender, temp); pairAppender.put(temp);
} }
} }
foreach(node; toMerge) foreach(node; toMerge)
{ {
merge(*pairAppender, flatten(node, startMark, endMark, pairAppender.put(flatten(node, startMark, endMark,
pairAppenderLevel + 1, nodeAppenderLevel)); pairAppenderLevel + 1, nodeAppenderLevel));
} }
} }
@ -327,7 +329,7 @@ final class Composer
else if(root.isSequence) foreach(ref Node node; root) else if(root.isSequence) foreach(ref Node node; root)
{ {
if(!node.isType!(Node.Pair[])){error(node);} if(!node.isType!(Node.Pair[])){error(node);}
merge(*pairAppender, flatten(node, startMark, endMark, pairAppender.put(flatten(node, startMark, endMark,
pairAppenderLevel + 1, nodeAppenderLevel)); pairAppenderLevel + 1, nodeAppenderLevel));
} }
else else
@ -368,7 +370,7 @@ final class Composer
//Not YAMLMerge, just add the pair. //Not YAMLMerge, just add the pair.
else else
{ {
merge(*pairAppender, pair); pairAppender.put(pair);
} }
} }
foreach(node; toMerge) foreach(node; toMerge)
@ -376,6 +378,12 @@ final class Composer
merge(*pairAppender, flatten(node[0], startEvent.startMark, node[1], merge(*pairAppender, flatten(node[0], startEvent.startMark, node[1],
pairAppenderLevel + 1, nodeAppenderLevel)); pairAppenderLevel + 1, nodeAppenderLevel));
} }
auto numUnique = pairAppender.data.dup
.sort!((x,y) => x.key > y.key)
.uniq!((x,y) => x.key == y.key)
.walkLength;
enforce(numUnique == pairAppender.data.length,
new ComposerException("Duplicate key found in mapping", parser_.getEvent().startMark));
Node node = constructor_.node(startEvent.startMark, parser_.getEvent().endMark, Node node = constructor_.node(startEvent.startMark, parser_.getEvent().endMark,
tag, pairAppender.data.dup, startEvent.collectionStyle); tag, pairAppender.data.dup, startEvent.collectionStyle);

16
source/dyaml/node.d
View file

@ -2195,22 +2195,6 @@ struct Node
} }
package: package:
// Merge a pair into an array of pairs based on merge rules in the YAML spec.
//
// The new pair will only be added if there is not already a pair
// with the same key.
//
// Params: pairs = Appender managing the array of pairs to merge into.
// toMerge = Pair to merge.
void merge(ref Appender!(Node.Pair[]) pairs, ref Node.Pair toMerge) @safe
{
foreach(ref pair; pairs.data)
{
if(pair.key == toMerge.key){return;}
}
pairs.put(toMerge);
}
// Merge pairs into an array of pairs based on merge rules in the YAML spec. // Merge pairs into an array of pairs based on merge rules in the YAML spec.
// //
// Any new pair will only be added if there is not already a pair // Any new pair will only be added if there is not already a pair