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

Merge pull request #7364 from RoosterDragon/yaml-redo

Browse Source 
Reassert some changes lost in rebasing in MiniYaml.cs.
This commit is contained in:
Oliver Brakmann
2015-01-21 20:14:32 +01:00
parent e875240ca3 c39ff6894c
commit ee3b4e6652
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
{
const int SpacesPerLevel = 4;
static Func<string, string> stringIdentity = s => s;
static Func<MiniYaml, MiniYaml> miniYamlIdentity = my => my;
static readonly Func<string, string> StringIdentity = s => s;
static readonly Func<MiniYaml, MiniYaml> MiniYamlIdentity = my => my;
public string Value;
public List<MiniYamlNode> Nodes;
public Dictionary<string, MiniYaml> ToDictionary()
{
return ToDictionary(miniYamlIdentity);
return ToDictionary(MiniYamlIdentity);
}
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>(
@@ -155,8 +155,9 @@ namespace OpenRA
var line = ll;
++lineNo;
if (line.Contains('#'))
line = line.Substring(0, line.IndexOf('#')).TrimEnd(' ', '\t');
var commentIndex = line.IndexOf('#');
if (commentIndex != -1)
line = line.Substring(0, commentIndex).TrimEnd(' ', '\t');
if (line.Length == 0)
continue;
var cp = 0;