Move yaml removals to the end of the merge.

OpenRA.Game/GameRules/ActorInfo.cs

@@ -35,20 +35,16 @@ namespace OpenRA
 		{
 			try
 			{
+				Name = name;
+
 				var allParents = new HashSet<string>();
 				var abstractActorType = name.StartsWith("^");
 
 				// Guard against circular inheritance
 				allParents.Add(name);
-				var mergedNode = MergeWithParents(node, allUnits, allParents).ToDictionary();
-
-				Name = name;
-
-				foreach (var t in mergedNode)
-				{
-					if (t.Key[0] == '-')
-						throw new YamlException("Bogus trait removal: " + t.Key);
 
+				var partial = MergeWithParents(node, allUnits, allParents);
+				foreach (var t in MiniYaml.ApplyRemovals(partial.Nodes))
 					if (t.Key != "Inherits" && !t.Key.StartsWith("Inherits@"))
 						try
 						{
@@ -59,7 +55,6 @@ namespace OpenRA
 							if (!abstractActorType)
 								throw new YamlException(e.Message);
 						}
-				}
 			}
 			catch (YamlException e)
 			{
@@ -98,7 +93,7 @@ namespace OpenRA
 					throw new YamlException(
 						"Bogus inheritance -- duplicate inheritance of {0}.".F(kv.Key));
 
-				node = MiniYaml.Merge(node, MergeWithParents(kv.Value, allUnits, allParents));
+				node = MiniYaml.MergePartial(node, MergeWithParents(kv.Value, allUnits, allParents));
 			}
 
 			return node;

OpenRA.Game/GameRules/RulesetCache.cs

@@ -99,7 +99,7 @@ namespace OpenRA
 
 			var inputKey = string.Concat(string.Join("|", files), "|", nodes.WriteToString());
 
-			var mergedNodes = files
+			var partial = files
 				.Select(s => MiniYaml.FromFile(s))
 				.Aggregate(nodes, MiniYaml.MergePartial);
 
@@ -117,8 +117,8 @@ namespace OpenRA
 				return t;
 			};
 
-			var yy = mergedNodes.ToDictionary(x => x.Key, x => x.Value);
+			var yy = partial.ToDictionary(x => x.Key, x => x.Value);
-			var itemSet = mergedNodes.ToDictionaryWithConflictLog(kv => kv.Key.ToLowerInvariant(), kv => wrap(kv, yy), "LoadYamlRules", null, null);
+			var itemSet = partial.ToDictionaryWithConflictLog(kv => kv.Key.ToLowerInvariant(), kv => wrap(kv, yy), "LoadYamlRules", null, null);
 
 			RaiseProgress();
 			return itemSet;

OpenRA.Game/Graphics/ChromeProvider.cs

@@ -33,7 +33,11 @@ namespace OpenRA.Graphics
 			cachedSheets = new Dictionary<string, Sheet>();
 			cachedSprites = new Dictionary<string, Dictionary<string, Sprite>>();
 
-			var chrome = chromeFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergePartial);
+			var partial = chromeFiles
+				.Select(s => MiniYaml.FromFile(s))
+				.Aggregate(MiniYaml.MergePartial);
+
+			var chrome = MiniYaml.ApplyRemovals(partial);
 
 			foreach (var c in chrome)
 				LoadCollection(c.Key, c.Value);

OpenRA.Game/Graphics/CursorProvider.cs

@@ -25,7 +25,11 @@ namespace OpenRA.Graphics
 		public CursorProvider(ModData modData)
 		{
 			var sequenceFiles = modData.Manifest.Cursors;
-			var sequences = new MiniYaml(null, sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergePartial));
+			var partial = sequenceFiles
+				.Select(s => MiniYaml.FromFile(s))
+				.Aggregate(MiniYaml.MergePartial);
+
+			var sequences = new MiniYaml(null, MiniYaml.ApplyRemovals(partial));
 			var shadowIndex = new int[] { };
 
 			var nodesDict = sequences.ToDictionary();

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -127,10 +127,11 @@ namespace OpenRA.Graphics
 		{
 			var sequenceFiles = modData.Manifest.Sequences;
 
-			var nodes = sequenceFiles
+			var partial = sequenceFiles
 				.Select(s => MiniYaml.FromFile(s))
 				.Aggregate(sequenceNodes, MiniYaml.MergePartial);
 
+			var nodes = MiniYaml.ApplyRemovals(partial);
 			var items = new Dictionary<string, UnitSequences>();
 			foreach (var n in nodes)
 			{

OpenRA.Game/Graphics/VoxelProvider.cs

@@ -23,10 +23,11 @@ namespace OpenRA.Graphics
 		{
 			units = new Dictionary<string, Dictionary<string, Voxel>>();
 
-			var sequences = voxelFiles
+			var partial = voxelFiles
 				.Select(s => MiniYaml.FromFile(s))
 				.Aggregate(voxelNodes, MiniYaml.MergePartial);
 
+			var sequences = MiniYaml.ApplyRemovals(partial);
 			foreach (var s in sequences)
 				LoadVoxelsForUnit(s.Key, s.Value);
 

OpenRA.Game/MiniYaml.cs

@@ -264,15 +264,10 @@ namespace OpenRA
 
 		public static List<MiniYamlNode> Merge(List<MiniYamlNode> a, List<MiniYamlNode> b)
 		{
-			return Merge(a, b, false);
+			return ApplyRemovals(MergePartial(a, b));
 		}
 
 		public static List<MiniYamlNode> MergePartial(List<MiniYamlNode> a, List<MiniYamlNode> b)
-		{
-			return Merge(a, b, true);
-		}
-
-		static List<MiniYamlNode> Merge(List<MiniYamlNode> a, List<MiniYamlNode> b, bool allowUnresolvedRemoves = false)
 		{
 			if (a.Count == 0)
 				return b;
@@ -286,58 +281,49 @@ namespace OpenRA
 			var dictB = b.ToDictionaryWithConflictLog(x => x.Key, "MiniYaml.Merge", null, x => "{0} (at {1})".F(x.Key, x.Location));
 			var allKeys = dictA.Keys.Union(dictB.Keys);
 
-			var keys = allKeys.Where(x => x.Length == 0 || x[0] != '-').ToList();
+			foreach (var key in allKeys)
-			var removeKeys = allKeys.Where(x => x.Length > 0 && x[0] == '-')
-				.Select(k => k.Substring(1)).ToHashSet();
-
-			foreach (var key in keys)
 			{
 				MiniYamlNode aa, bb;
 				dictA.TryGetValue(key, out aa);
 				dictB.TryGetValue(key, out bb);
 
-				if (removeKeys.Contains(key))
+				var loc = aa == null ? default(MiniYamlNode.SourceLocation) : aa.Location;
-					removeKeys.Remove(key);
+				var merged = (aa == null || bb == null) ? aa ?? bb : new MiniYamlNode(key, MergePartial(aa.Value, bb.Value), loc);
-				else
+				ret.Add(merged);
-				{
-					var loc = aa == null ? default(MiniYamlNode.SourceLocation) : aa.Location;
-					var merged = (aa == null || bb == null) ? aa ?? bb : new MiniYamlNode(key, Merge(aa.Value, bb.Value, allowUnresolvedRemoves), loc);
-					ret.Add(merged);
-				}
-			}
-
-			if (removeKeys.Any())
-			{
-				if (allowUnresolvedRemoves)
-				{
-					// Add the removal nodes back for the next pass to deal with
-					foreach (var k in removeKeys)
-					{
-						var key = "-" + k;
-						MiniYamlNode rem;
-						if (!dictA.TryGetValue(key, out rem))
-							rem = dictB[key];
-						ret.Add(rem);
-					}
-				}
-				else
-					throw new YamlException("Bogus yaml removals: {0}".F(removeKeys.JoinWith(", ")));
 			}
 
 			return ret;
 		}
 
+		public static List<MiniYamlNode> ApplyRemovals(List<MiniYamlNode> a)
+		{
+			var removeKeys = a.Select(x => x.Key)
+				.Where(x => x.Length > 0 && x[0] == '-')
+				.Select(k => k.Substring(1))
+				.ToHashSet();
+
+			var ret = new List<MiniYamlNode>();
+			foreach (var x in a)
+			{
+				if (x.Key[0] == '-')
+					continue;
+
+				if (removeKeys.Contains(x.Key))
+					removeKeys.Remove(x.Key);
+				else
+				{
+					x.Value.Nodes = ApplyRemovals(x.Value.Nodes);
+					ret.Add(x);
+				}
+			}
+
+			if (removeKeys.Any())
+				throw new YamlException("Bogus yaml removals: {0}".F(removeKeys.JoinWith(", ")));
+
+			return ret;
+		}
+
 		public static MiniYaml MergePartial(MiniYaml a, MiniYaml b)
-		{
-			return Merge(a, b, true);
-		}
-
-		public static MiniYaml Merge(MiniYaml a, MiniYaml b)
-		{
-			return Merge(a, b, false);
-		}
-
-		static MiniYaml Merge(MiniYaml a, MiniYaml b, bool allowUnresolvedRemoves)
 		{
 			if (a == null)
 				return b;
@@ -345,7 +331,18 @@ namespace OpenRA
 			if (b == null)
 				return a;
 
-			return new MiniYaml(a.Value ?? b.Value, Merge(a.Nodes, b.Nodes, allowUnresolvedRemoves));
+			return new MiniYaml(a.Value ?? b.Value, MergePartial(a.Nodes, b.Nodes));
+		}
+
+		public static MiniYaml Merge(MiniYaml a, MiniYaml b)
+		{
+			if (a == null)
+				return b;
+
+			if (b == null)
+				return a;
+
+			return new MiniYaml(a.Value ?? b.Value, Merge(a.Nodes, b.Nodes));
 		}
 
 		public IEnumerable<string> ToLines(string name)

OpenRA.Game/ModData.cs

@@ -119,11 +119,10 @@ namespace OpenRA
 				return;
 			}
 
-			var yaml = Manifest.Translations.Select(MiniYaml.FromFile).Aggregate(MiniYaml.MergePartial);
+			var partial = Manifest.Translations.Select(MiniYaml.FromFile).Aggregate(MiniYaml.MergePartial);
-			Languages = yaml.Select(t => t.Key).ToArray();
+			Languages = partial.Select(t => t.Key).ToArray();
-
-			yaml = MiniYaml.MergePartial(map.TranslationDefinitions, yaml);
 
+			var yaml = MiniYaml.Merge(map.TranslationDefinitions, partial);
 			foreach (var y in yaml)
 			{
 				if (y.Key == Game.Settings.Graphics.Language)

OpenRA.Game/Widgets/ChromeMetrics.cs

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

OpenRA.Mods.Common/Lint/CheckSequences.cs

@@ -32,8 +32,10 @@ namespace OpenRA.Mods.Common.Lint
 			this.emitError = emitError;
 
 			var sequenceSource = map != null ? map.SequenceDefinitions : new List<MiniYamlNode>();
-			sequenceDefinitions = MiniYaml.MergePartial(sequenceSource,
+			var partial = Game.ModData.Manifest.Sequences
-				Game.ModData.Manifest.Sequences.Select(MiniYaml.FromFile).Aggregate(MiniYaml.MergePartial));
+				.Select(MiniYaml.FromFile)
+				.Aggregate(MiniYaml.MergePartial);
+			sequenceDefinitions = MiniYaml.Merge(sequenceSource, partial);
 
 			var rules = map == null ? Game.ModData.DefaultRules : map.Rules;
 			var factions = rules.Actors["world"].TraitInfos<FactionInfo>().Select(f => f.InternalName).ToArray();

OpenRA.Mods.Common/UtilityCommands/CheckSequenceSprites.cs

@@ -39,10 +39,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
 				var sc = new SpriteCache(modData.SpriteLoaders, new SheetBuilder(SheetType.Indexed));
 				var sequenceFiles = modData.Manifest.Sequences;
 
-				var nodes = sequenceFiles
+				var partial = sequenceFiles
 					.Select(s => MiniYaml.FromFile(s))
 					.Aggregate(MiniYaml.MergePartial);
 
+				var nodes = MiniYaml.ApplyRemovals(partial);
 				foreach (var n in nodes)
 					Game.ModData.SpriteSequenceLoader.ParseSequences(Game.ModData, ts, sc, n);
 			}

OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs

@@ -97,8 +97,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			// Add a group for each campaign
 			if (Game.ModData.Manifest.Missions.Any())
 			{
-				var yaml = Game.ModData.Manifest.Missions.Select(MiniYaml.FromFile).Aggregate(MiniYaml.MergePartial);
+				var partial = Game.ModData.Manifest.Missions
+					.Select(MiniYaml.FromFile)
+					.Aggregate(MiniYaml.MergePartial);
 
+				var yaml = MiniYaml.ApplyRemovals(partial);
 				foreach (var kv in yaml)
 				{
 					var missionMapPaths = kv.Value.Nodes.Select(n => Path.GetFullPath(n.Key));