2004-12-01 Atsushi Enomoto <atsushi@ximian.com>

	* Compiler.cs : don't create XPathNavigatorNsm for every GetNsm() call.

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

diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog b/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog
index 840a53fd0515f6d416d51d9175b9f9991c48a789..25f8c9acddb30bb6271e42f7f8948ed7af2b2ed4 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog
+++ b/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-01  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * Compiler.cs : don't create XPathNavigatorNsm for every GetNsm() call.
+
 2004-11-26  Atsushi Enomoto  <atsushi@ximian.com>
 
        * XslKey.cs, XslStylesheet.cs, MSXslScriptManager.cs :

diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs b/mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs
index a18be78557346722024445abdd29edc90aee14fe..55af46dac86dff06339e0b8b53da956fb7d04b3a 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs
+++ b/mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs
@@ -106,8 +106,8 @@ namespace Mono.Xml.Xsl
        internal class Compiler : IStaticXsltContext {
                public const string XsltNamespace = "http://www.w3.org/1999/XSL/Transform";
                        
-               ArrayList inputStack = new ArrayList ();
-               XPathNavigator currentInput;
+               ArrayList inputNSResolverStack = new ArrayList ();
+               XPathNavigatorNsm currentNsm;
                
                Stack styleStack = new Stack ();
                XslStylesheet currentStyle;
@@ -169,7 +169,7 @@ namespace Mono.Xml.Xsl
                
 #region Input
                public XPathNavigator Input {
-                       get { return currentInput; }
+                       get { return currentNsm.Navigator; }
                }
                
                public XslStylesheet CurrentStylesheet {
@@ -213,26 +213,29 @@ namespace Mono.Xml.Xsl
                
                private void PushInputDocument (XPathNavigator nav)
                {
-                       for (int i = 0; i < inputStack.Count; i++) {
-                               XPathNavigator cur = (XPathNavigator) inputStack [i];
+                       // Inclusion nest check
+                       IXmlLineInfo li = currentNsm != null ?
+                               currentNsm.Navigator as IXmlLineInfo : null;
+                       bool hasLineInfo = (li != null && !li.HasLineInfo ());
+                       for (int i = 0; i < inputNSResolverStack.Count; i++) {
+                               XPathNavigator cur = ((XPathNavigatorNsm) inputNSResolverStack [i]).Navigator;
                                if (cur.BaseURI == nav.BaseURI) {
-                                       IXmlLineInfo li = currentInput as IXmlLineInfo;
                                        throw new XsltCompileException (null,
-                                               currentInput.BaseURI, 
-                                               li != null ? li.LineNumber : 0,
-                                               li != null ? li.LinePosition : 0);
+                                               currentNsm.Navigator.BaseURI, 
+                                               hasLineInfo ? li.LineNumber : 0,
+                                               hasLineInfo ? li.LinePosition : 0);
                                }
                        }
-                       if (currentInput != null)
-                               inputStack.Add (currentInput);
-                       currentInput = nav;
+                       if (currentNsm != null)
+                               inputNSResolverStack.Add (currentNsm);
+                       currentNsm = new XPathNavigatorNsm (nav);
                }
                
                public void PopInputDocument ()
                {
-                       int last = inputStack.Count - 1;
-                       currentInput = (XPathNavigator) inputStack [last];
-                       inputStack.RemoveAt (last);
+                       int last = inputNSResolverStack.Count - 1;
+                       currentNsm = (XPathNavigatorNsm) inputNSResolverStack [last];
+                       inputNSResolverStack.RemoveAt (last);
                }
                
                public QName ParseQNameAttribute (string localName)
@@ -549,12 +552,12 @@ namespace Mono.Xml.Xsl
                
                XmlNamespaceManager IStaticXsltContext.GetNsm ()
                {
-                       return new XPathNavigatorNsm (Input);
+                       return currentNsm;
                }
                
                public XmlNamespaceManager GetNsm ()
                {
-                       return new XPathNavigatorNsm (Input);
+                       return currentNsm;
                }
 #endregion
                public void CompileOutput ()
@@ -825,7 +828,11 @@ namespace Mono.Xml.Xsl
                        if (nsScope.NodeType == XPathNodeType.Attribute)
                                nsScope.MoveToParent ();
                }
-               
+
+               public XPathNavigator Navigator {
+                       get { return nsScope; }
+               }
+
                public override string DefaultNamespace { get { return String.Empty; }}
 
 #if NET_2_0