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

Reassert some changes lost in rebasing in MiniYaml.cs.

Browse Source
This commit is contained in:
RoosterDragon
2015-01-20 20:52:02 +00:00
parent 7267a3afdb
commit c39ff6894c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Game/MiniYaml.cs
View File

@@ -84,19 +84,19 @@ namespace OpenRA
public class MiniYaml public class MiniYaml
{ {
const int SpacesPerLevel = 4; const int SpacesPerLevel = 4;
static Func<string, string> stringIdentity = s => s; static readonly Func<string, string> StringIdentity = s => s;
static Func<MiniYaml, MiniYaml> miniYamlIdentity = my => my; static readonly Func<MiniYaml, MiniYaml> MiniYamlIdentity = my => my;
public string Value; public string Value;
public List<MiniYamlNode> Nodes; public List<MiniYamlNode> Nodes;
public Dictionary<string, MiniYaml> ToDictionary() public Dictionary<string, MiniYaml> ToDictionary()
{ {
return ToDictionary(miniYamlIdentity); return ToDictionary(MiniYamlIdentity);
} }
public Dictionary<string, TElement> ToDictionary<TElement>(Func<MiniYaml, TElement> elementSelector) public Dictionary<string, TElement> ToDictionary<TElement>(Func<MiniYaml, TElement> elementSelector)
{ {
return ToDictionary(stringIdentity, elementSelector); return ToDictionary(StringIdentity, elementSelector);
} }
public Dictionary<TKey, TElement> ToDictionary<TKey, TElement>( public Dictionary<TKey, TElement> ToDictionary<TKey, TElement>(
@@ -155,8 +155,9 @@ namespace OpenRA
var line = ll; var line = ll;
++lineNo; ++lineNo;
if (line.Contains('#')) var commentIndex = line.IndexOf('#');
line = line.Substring(0, line.IndexOf('#')).TrimEnd(' ', '\t'); if (commentIndex != -1)
line = line.Substring(0, commentIndex).TrimEnd(' ', '\t');
if (line.Length == 0) if (line.Length == 0)
continue; continue;
var cp = 0; var cp = 0;