* mono-api.xsl: Added support for nested classes.

* mono-api-diff.cs: Renamed element used for nested classes from
nestedclass to class to avoid duplicating templates in xsl.

svn path=/trunk/mcs/; revision=81066

diff --git a/mcs/tools/corcompare/mono-api-diff.cs b/mcs/tools/corcompare/mono-api-diff.cs
index e6150f3c2b7b2035259b84af1f2951968a9ac39f..e6089db5dbaffc81ee50111e1ad527749c7dce8f 100644 (file)
--- a/mcs/tools/corcompare/mono-api-diff.cs
+++ b/mcs/tools/corcompare/mono-api-diff.cs
@@ -864,7 +864,7 @@ namespace Mono.AssemblyCompare
                        for (int i = 0; i < count; i++) {
                                XMLClass xclass = nested [i];
 
-                               node = document.CreateElement ("nestedclass", null);
+                               node = document.CreateElement ("class", null);
                                newNodes.Add (node);
                                AddAttribute (node, "name", xclass.Name);
                                AddAttribute (node, "type", xclass.Type);
@@ -889,7 +889,7 @@ namespace Mono.AssemblyCompare
                                        if (c == null || IsMonoTODOAttribute (c.Name))
                                                continue;
 
-                                       node = document.CreateElement ("nestedclass", null);
+                                       node = document.CreateElement ("class", null);
                                        newNodes.Add (node);
                                        AddAttribute (node, "name", c.Name);
                                        AddExtra (node);

diff --git a/mcs/tools/corcompare/mono-api.xsl b/mcs/tools/corcompare/mono-api.xsl
index 6ca2a18c23b80b1520388d0875e310c20d14a21b..6b2856b268f2f35d9773402617bf8fa64372795a 100644 (file)
--- a/mcs/tools/corcompare/mono-api.xsl
+++ b/mcs/tools/corcompare/mono-api.xsl
@@ -160,21 +160,7 @@
 
 
        <xsl:template match="namespace/classes">
-               <xsl:apply-templates select="class[@type='interface']">
-                       <xsl:sort select="@name"/>
-               </xsl:apply-templates>
-               <xsl:apply-templates select="class[@type='class']">
-                       <xsl:sort select="@name"/>
-               </xsl:apply-templates>
-               <xsl:apply-templates select="class[@type='struct']">
-                       <xsl:sort select="@name"/>
-               </xsl:apply-templates>
-               <xsl:apply-templates select="class[@type='delegate']">
-                       <xsl:sort select="@name"/>
-               </xsl:apply-templates>
-               <xsl:apply-templates select="class[@type='enum']">
-                       <xsl:sort select="@name"/>
-               </xsl:apply-templates>
+               <xsl:apply-templates />
        </xsl:template>
 
 
@@ -423,7 +409,24 @@
                </div>
        </xsl:template>
 
-
+       <!-- nested classes -->
+       <xsl:template match="classes">
+               <xsl:apply-templates select="class[@type='interface']">
+                       <xsl:sort select="@name"/>
+               </xsl:apply-templates>
+               <xsl:apply-templates select="class[@type='class']">
+                       <xsl:sort select="@name"/>
+               </xsl:apply-templates>
+               <xsl:apply-templates select="class[@type='struct']">
+                       <xsl:sort select="@name"/>
+               </xsl:apply-templates>
+               <xsl:apply-templates select="class[@type='delegate']">
+                       <xsl:sort select="@name"/>
+               </xsl:apply-templates>
+               <xsl:apply-templates select="class[@type='enum']">
+                       <xsl:sort select="@name"/>
+               </xsl:apply-templates>
+       </xsl:template>
 
        <!-- support templates -->