Allow comparison of function elements

This allows us to store both enums and functions in the same tree.
This commit is contained in:
Stefanos A. 2013-10-28 14:15:58 +01:00
parent 3eaffc5570
commit 8f1c3a2d08

View file

@ -44,9 +44,9 @@ namespace CHeaderToXML
public int GetHashCode(XNode a)
{
XElement e = (XElement)a;
if (e.Name == "enum" || e.Name == "token")
if (e.Name == "enum" || e.Name == "token" || e.Name == "function")
{
return ((XElement)a).Attribute("name").Value.GetHashCode();
return ((XElement)a).Attribute("name").Value.GetHashCode() ^ e.Name.LocalName.GetHashCode();
}
else if (e.Name == "use")
{
@ -181,10 +181,10 @@ namespace CHeaderToXML
private static Dictionary<string, XElement> MergeDuplicates(IEnumerable<IEnumerable<XElement>> sigs)
{
var entries = new Dictionary<string, XElement>();
foreach (var e in sigs.SelectMany(s => s).Where(s => s.Name.LocalName == "enum"))
foreach (var e in sigs.SelectMany(s => s))//.Where(s => s.Name.LocalName == "enum"))
{
var name = (string)e.Attribute("name");
if (entries.ContainsKey(name) && e.Name.LocalName == "enum")
var name = (string)e.Attribute("name") ?? "";
if (entries.ContainsKey(name))// && e.Name.LocalName == "enum")
{
var p = entries[name];
var curTokens = p.Nodes().ToList();
@ -192,8 +192,10 @@ namespace CHeaderToXML
p.Add(curTokens.Concat(e.Nodes()).Distinct(new EnumTokenComparer()));
}
else
{
entries.Add(name, e);
}
}
return entries;
}
}