ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-11 21:25:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added ReadEnums overload that works with a XPathNavigator directly. Necessary for new overrides.xml handling.

Browse source
This commit is contained in:
the_fiddler 2010-12-03 11:22:11 +00:00
parent 3021f668ad
commit 5c3d94aeef
1 changed files with 65 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
Source/Bind/XmlSpecReader.cs
View file

@ -200,83 +200,91 @@ namespace Bind
// Every single enum is merged into // Every single enum is merged into
EnumCollection enums = new EnumCollection(); EnumCollection enums = new EnumCollection();
Enum all = new Enum() { Name = Settings.CompleteEnumName };
XPathDocument specs = new XPathDocument(specFile); XPathDocument specs = new XPathDocument(specFile);
XPathDocument overrides = new XPathDocument(new StreamReader( XPathDocument overrides = new XPathDocument(new StreamReader(
Path.Combine(Settings.InputPath, Settings.OverridesFile))); Path.Combine(Settings.InputPath, Settings.OverridesFile)));
foreach (XPathNavigator nav in new XPathNavigator[] { foreach (XPathNavigator nav in specs.CreateNavigator().Select("/signatures/add"))
specs.CreateNavigator().SelectSingleNode("/signatures/add"),
overrides.CreateNavigator().SelectSingleNode("/signatures/add") })
{ {
if (nav != null) var new_enums = ReadEnums(nav);
Utilities.Merge(enums, new_enums);
}
return enums;
}
public EnumCollection ReadEnums(XPathNavigator nav)
{
EnumCollection enums = new EnumCollection();
Enum all = new Enum() { Name = Settings.CompleteEnumName };
if (nav != null)
{
foreach (XPathNavigator node in nav.SelectChildren("enum", String.Empty))
{ {
foreach (XPathNavigator node in nav.SelectChildren("enum", String.Empty)) Enum e = new Enum()
{ {
Enum e = new Enum() Name = node.GetAttribute("name", String.Empty),
Type = node.GetAttribute("type", String.Empty)
};
if (String.IsNullOrEmpty(e.Name))
throw new InvalidOperationException(String.Format("Empty name for enum element {0}", node.ToString()));
foreach (XPathNavigator param in node.SelectChildren(XPathNodeType.Element))
{
Constant c = null;
switch (param.Name)
{ {
Name = node.GetAttribute("name", String.Empty), case "token":
Type = node.GetAttribute("type", String.Empty) c = new Constant
}; {
if (String.IsNullOrEmpty(e.Name)) Name = param.GetAttribute("name", String.Empty),
throw new InvalidOperationException(String.Format("Empty name for enum element {0}", node.ToString())); Value = param.GetAttribute("value", String.Empty)
};
break;
foreach (XPathNavigator param in node.SelectChildren(XPathNodeType.Element)) case "use":
c = new Constant
{
Name = param.GetAttribute("token", String.Empty),
Reference = param.GetAttribute("enum", String.Empty),
Value = param.GetAttribute("token", String.Empty),
};
break;
default:
throw new NotSupportedException();
}
Utilities.Merge(all, c);
try
{ {
Constant c = null; if (!e.ConstantCollection.ContainsKey(c.Name))
switch (param.Name)
{ {
case "token": e.ConstantCollection.Add(c.Name, c);
c = new Constant
{
Name = param.GetAttribute("name", String.Empty),
Value = param.GetAttribute("value", String.Empty)
};
break;
case "use":
c = new Constant
{
Name = param.GetAttribute("token", String.Empty),
Reference = param.GetAttribute("enum", String.Empty),
Value = param.GetAttribute("token", String.Empty),
};
break;
default:
throw new NotSupportedException();
} }
Utilities.Merge(all, c); else if (e.ConstantCollection[c.Name].Value != c.Value)
try
{ {
if (!e.ConstantCollection.ContainsKey(c.Name)) var existing = e.ConstantCollection[c.Name];
if (existing.Reference != null && c.Reference == null)
{ {
e.ConstantCollection.Add(c.Name, c); e.ConstantCollection[c.Name] = c;
} }
else if (e.ConstantCollection[c.Name].Value != c.Value) else if (existing.Reference == null && c.Reference != null)
{ } // Keep existing
else
{ {
var existing = e.ConstantCollection[c.Name]; Console.WriteLine("[Warning] Conflicting token {0}.{1} with value {2} != {3}",
if (existing.Reference != null && c.Reference == null) e.Name, c.Name, e.ConstantCollection[c.Name].Value, c.Value);
{
e.ConstantCollection[c.Name] = c;
}
else if (existing.Reference == null && c.Reference != null)
{ } // Keep existing
else
{
Console.WriteLine("[Warning] Conflicting token {0}.{1} with value {2} != {3}",
e.Name, c.Name, e.ConstantCollection[c.Name].Value, c.Value);
}
} }
} }
catch (ArgumentException ex)
{
Console.WriteLine("[Warning] Failed to add constant {0} to enum {1}: {2}", c.Name, e.Name, ex.Message);
}
} }
catch (ArgumentException ex)
Utilities.Merge(enums, e); {
Console.WriteLine("[Warning] Failed to add constant {0} to enum {1}: {2}", c.Name, e.Name, ex.Message);
}
} }
Utilities.Merge(enums, e);
} }
} }