Struct Scraping Support (#916)

dotnet · May 15, 2022 · 94036b5 · 94036b5
1 parent ef62a5c
commit 94036b5
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/src/generators/Silk.NET.SilkTouch.Scraper/ClangScraper.cs b/src/generators/Silk.NET.SilkTouch.Scraper/ClangScraper.cs
@@ -35,7 +35,7 @@ public sealed class ClangScraper
     /// <returns>Any number of symbols scraped from the given xml</returns>
     public IEnumerable<Symbol> ScrapeXML(XmlDocument document)
     {
-        var bindings = document.ChildNodes.Cast<XmlNode>().FirstOrDefault(x => x.LocalName == "bindings" && x is XmlElement) as XmlElement;
+        var bindings = document.ChildNodes.Cast<XmlNode>().OfType<XmlElement>().FirstOrDefault();
 
         if (bindings is null)
         {

diff --git a/src/generators/Silk.NET.SilkTouch.Scraper/XmlVisitor.cs b/src/generators/Silk.NET.SilkTouch.Scraper/XmlVisitor.cs
@@ -21,13 +21,27 @@ public IEnumerable<Symbol> Visit(XmlNode node)
                 return VisitBinding(bindings);
             case XmlElement { Name: "namespace" } @namespace:
                 return VisitNamespace(@namespace);
+            case XmlElement { Name: "struct" } @struct:
+                return VisitStruct(@struct);
             default:
             {
                 throw new NotImplementedException();
             }
         }
     }
 
+    private IEnumerable<Symbol> VisitStruct(XmlElement @struct)
+    {
+        return new[]
+        {
+            new StructSymbol
+            (
+                new IdentifierSymbol(@struct.Attributes?["name"]?.Value ?? throw new InvalidOperationException()),
+                StructLayout.Empty
+            )
+        };
+    }
+
     private IEnumerable<Symbol> VisitBinding(XmlElement bindings)
     {
         return bindings.ChildNodes.Cast<XmlNode>().Where(x => x is not null).SelectMany(Visit);

diff --git a/tests/Silk.NET.SilkTouch.Scraper.Tests/StructScrapingTests.cs b/tests/Silk.NET.SilkTouch.Scraper.Tests/StructScrapingTests.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Xml;
+using Silk.NET.SilkTouch.Symbols;
 using Xunit;
 
 namespace Silk.NET.SilkTouch.Scraper.Tests;
@@ -10,6 +12,25 @@ public class StructScrapingTests
     [Fact]
     public void StructXMLGeneratesStructSymbol()
     {
+        var doc = new XmlDocument();
+        doc.LoadXml(@"<struct name=""Test""></struct>");
 
+        var symbols = new ClangScraper().ScrapeXML(doc);
+
+        var symbol = Assert.Single(symbols);
+        var @struct = Assert.IsType<StructSymbol>(symbol);
+    }
+
+    [Fact]
+    public void StructXMLGeneratesCorrectIdentifier()
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml(@"<struct name=""Test""></struct>");
+
+        var symbols = new ClangScraper().ScrapeXML(doc);
+
+        var symbol = Assert.Single(symbols);
+        var @struct = Assert.IsType<StructSymbol>(symbol);
+        Assert.Equal("Test", @struct.Identifier.Value);
     }
 }