Rewrite yaml merger.

This commit is contained in:
Paul Chote
2016-01-30 03:04:34 +00:00
parent 1581ba951f
commit ab921682c4
15 changed files with 253 additions and 305 deletions

View File

@@ -20,11 +20,8 @@ namespace OpenRA.Widgets
public static void Initialize(IEnumerable<string> yaml)
{
data = new Dictionary<string, string>();
var partial = yaml
.Select(y => MiniYaml.FromFile(y))
.Aggregate(MiniYaml.MergePartial);
var metrics = MiniYaml.ApplyRemovals(partial);
var metrics = MiniYaml.Merge(yaml.Select(MiniYaml.FromFile));
foreach (var m in metrics)
foreach (var n in m.Value.Nodes)
data[n.Key] = n.Value.Value;