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

fix bug 609 -- removing traits that arent on an actor is an error.

Browse Source
This commit is contained in:
Chris Forbes
2011-04-05 21:26:32 +12:00
parent 576e9b90f6
commit 55c609ee16
2 changed files with 61 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
OpenRA.FileFormats/MiniYaml.cs
View File

@@ -21,7 +21,8 @@ namespace OpenRA.FileFormats
{
public struct SourceLocation
{
public string Filename; public int Line;
public string Filename; public int Line;
public override string ToString() { return "{0}:{1}".F(Filename, Line); }
}
public SourceLocation Location;
@@ -52,7 +53,12 @@ namespace OpenRA.FileFormats
public MiniYamlNode( string k, string v, List<MiniYamlNode> n, SourceLocation loc )
: this( k, new MiniYaml( v, n ), loc )
{
}
}
public override string ToString()
{
return "{{YamlNode: {0} @ {1}}}".F(Key, Location);
}
}
public class MiniYaml
@@ -95,7 +101,7 @@ namespace OpenRA.FileFormats
var level = line.Length - t.Length;
if (levels.Count <= level)
throw new InvalidOperationException("Bad indent in miniyaml");
throw new YamlException("Bad indent in miniyaml");
while (levels.Count > level + 1)
levels.RemoveAt(levels.Count - 1);
@@ -169,9 +175,10 @@ namespace OpenRA.FileFormats
var aDict = a.ToDictionary( x => x.Key );
var bDict = b.ToDictionary( x => x.Key );
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 keys = aDict.Keys.Union( bDict.Keys ).ToList();
var noInherit = keys.Where(x => x.Length > 0 && x[0] == '-')
.ToDictionary(x => x.Substring(1), x => false);
foreach( var key in keys )
{
@@ -179,10 +186,11 @@ namespace OpenRA.FileFormats
aDict.TryGetValue( key, out aa );
bDict.TryGetValue( key, out bb );
if( noInherit.Contains( key ) )
if( noInherit.ContainsKey( key ) )
{
if( aa != null )
ret.Add( aa );
// if( aa != null )
// ret.Add( aa );
noInherit[key] = true;
}
else
{
@@ -190,7 +198,11 @@ namespace OpenRA.FileFormats
var merged = ( aa == null || bb == null ) ? aa ?? bb : new MiniYamlNode( key, Merge( aa.Value, bb.Value ), loc );
ret.Add( merged );
}
}
}
if (noInherit.ContainsValue(false))
throw new YamlException("Bogus yaml removals: {0}".F(
string.Join(", ", noInherit.Where(x => !x.Value).Select(x => x.Key).ToArray())));
return ret;
}
@@ -236,5 +248,10 @@ namespace OpenRA.FileFormats
yield return "";
}
}
}
}
public class YamlException : Exception
{
public YamlException(string s) : base(s) { }
}
}