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

This commit is contained in:
the_fiddler 2010-12-03 09:43:08 +00:00
parent 58bebc8315
commit 47b16778ce

View file

@ -40,20 +40,13 @@ namespace Bind
class XmlSpecReader : ISpecReader class XmlSpecReader : ISpecReader
{ {
public DelegateCollection ReadDelegates(StreamReader specFile) #region Public Members
public DelegateCollection ReadDelegates(XPathNavigator specs)
{ {
DelegateCollection delegates = new DelegateCollection(); DelegateCollection delegates = new DelegateCollection();
XPathDocument specs = new XPathDocument(specFile);
XPathDocument overrides = new XPathDocument(new StreamReader(
Path.Combine(Settings.InputPath, Settings.OverridesFile)));
foreach (XPathNavigator nav in new XPathNavigator[] { foreach (XPathNavigator node in specs.SelectChildren("function", String.Empty))
specs.CreateNavigator().SelectSingleNode("/signatures"),
overrides.CreateNavigator().SelectSingleNode("/overrides/add") })
{
if (nav != null)
{
foreach (XPathNavigator node in nav.SelectChildren("function", String.Empty))
{ {
var name = node.GetAttribute("name", String.Empty); var name = node.GetAttribute("name", String.Empty);
@ -101,12 +94,20 @@ namespace Bind
delegates.Add(d); delegates.Add(d);
} }
}
}
return delegates; return delegates;
} }
#endregion
#region ISpecReader Members
public DelegateCollection ReadDelegates(StreamReader specFile)
{
XPathDocument specs = new XPathDocument(specFile);
return ReadDelegates(specs.CreateNavigator().SelectSingleNode("/signatures/add"));
}
public Dictionary<string, string> ReadTypeMap(StreamReader specFile) public Dictionary<string, string> ReadTypeMap(StreamReader specFile)
{ {
Console.WriteLine("Reading opengl types."); Console.WriteLine("Reading opengl types.");
@ -205,8 +206,8 @@ namespace Bind
Path.Combine(Settings.InputPath, Settings.OverridesFile))); Path.Combine(Settings.InputPath, Settings.OverridesFile)));
foreach (XPathNavigator nav in new XPathNavigator[] { foreach (XPathNavigator nav in new XPathNavigator[] {
specs.CreateNavigator().SelectSingleNode("/signatures"), specs.CreateNavigator().SelectSingleNode("/signatures/add"),
overrides.CreateNavigator().SelectSingleNode("/overrides/add") }) overrides.CreateNavigator().SelectSingleNode("/signatures/add") })
{ {
if (nav != null) if (nav != null)
{ {
@ -282,5 +283,7 @@ namespace Bind
Utilities.Merge(enums, all); Utilities.Merge(enums, all);
return enums; return enums;
} }
#endregion
} }
} }