epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

line numbers work in MiniYaml.Merge, too

Browse Source
This commit is contained in:
Bob
2010-08-27 14:13:19 +12:00
committed by Chris Forbes
parent 2a7857570a
commit 8dcd1e8fd1
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.FileFormats/MiniYaml.cs
View File

@@ -167,25 +167,29 @@ namespace OpenRA.FileFormats
var ret = new List<MiniYamlNode>(); var ret = new List<MiniYamlNode>();
var aDict = a.ToDictionary( x => x.Key, x => x.Value ); var aDict = a.ToDictionary( x => x.Key );
var bDict = b.ToDictionary( x => x.Key, x => x.Value ); var bDict = b.ToDictionary( x => x.Key );
var keys = aDict.Keys.Union( bDict.Keys ).ToList(); var keys = aDict.Keys.Union( bDict.Keys ).ToList();
var noInherit = keys.Where( x => x.Length > 0 && x[ 0 ] == '-' ).Select( x => x.Substring( 1 ) ).ToList(); var noInherit = keys.Where( x => x.Length > 0 && x[ 0 ] == '-' ).Select( x => x.Substring( 1 ) ).ToList();
foreach( var key in keys ) foreach( var key in keys )
{ {
MiniYaml aa, bb; MiniYamlNode aa, bb;
aDict.TryGetValue( key, out aa ); aDict.TryGetValue( key, out aa );
bDict.TryGetValue( key, out bb ); bDict.TryGetValue( key, out bb );
if( noInherit.Contains( key ) ) if( noInherit.Contains( key ) )
{ {
if( aa != null ) if( aa != null )
ret.Add( new MiniYamlNode( key, aa ) ); ret.Add( aa );
} }
else else
ret.Add( new MiniYamlNode( key, Merge( aa, bb ) ) ); {
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 ), loc );
ret.Add( merged );
}
} }
return ret; return ret;