2008-02-19 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / mcs / class / System.XML / Mono.Xml.XPath / LocationPathPattern.cs

diff --git a/mcs/class/System.XML/Mono.Xml.XPath/LocationPathPattern.cs b/mcs/class/System.XML/Mono.Xml.XPath/LocationPathPattern.cs
index 7853d83b6e3ea6af06cf88ca2b5257d5c141a3d9..97ddddad8e57c7e75a3b2cfa089dbfce57d0637b 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.XPath/LocationPathPattern.cs
+++ b/mcs/class/System.XML/Mono.Xml.XPath/LocationPathPattern.cs
@@ -35,6 +35,7 @@ using System.Xml;
 using System.Xml.Schema;
 using System.Xml.XPath;
 using System.Xml.Xsl;
+using Mono.Xml.Xsl;
 
 namespace Mono.Xml.XPath {
        internal class LocationPathPattern : Pattern {
@@ -43,7 +44,6 @@ namespace Mono.Xml.XPath {
                bool isAncestor;
                NodeTest nodeTest;
                ExprFilter filter;
-               XPathNavigator previousNavigator;
                
                public LocationPathPattern (NodeTest nodeTest)
                {
@@ -72,7 +72,7 @@ namespace Mono.Xml.XPath {
                                if (patternPrevious == null && filter == null) {
                                        NodeNameTest t = nodeTest as NodeNameTest;
                                        if (t != null) {
-                                               if (t.Name.Name == "*")
+                                               if (t.Name.Name == "*" || t.Name.Name.Length == 0)
                                                        return -.25;
                                                return 0;
                                        }
@@ -82,6 +82,10 @@ namespace Mono.Xml.XPath {
                                return .5;
                        }
                }
+
+               public override XPathNodeType EvaluatedNodeType {
+                       get { return nodeTest.EvaluatedNodeType; }
+               }
                
                public override bool Matches (XPathNavigator node, XsltContext ctx)
                {
@@ -100,19 +104,19 @@ namespace Mono.Xml.XPath {
                        if (filter == null && patternPrevious == null)
                                return true;
                        
+                       XPathNavigator tmpNav;
                        if (patternPrevious != null) {
+                               tmpNav = ((XsltCompiledContext) ctx).GetNavCache (this, node);
                                if (!isAncestor) {
-                                       XPathNavigator parent = node.Clone ();
-                                       parent.MoveToParent ();
-                                       if (!patternPrevious.Matches (parent, ctx))
+                                       tmpNav.MoveToParent ();
+                                       if (!patternPrevious.Matches (tmpNav, ctx))
                                                return false;
                                } else {
-                                       XPathNavigator anc = node.Clone ();
                                        while (true) {
-                                               if (!anc.MoveToParent ())
+                                               if (!tmpNav.MoveToParent ())
                                                        return false;
                                                
-                                               if (patternPrevious.Matches (anc, ctx))
+                                               if (patternPrevious.Matches (tmpNav, ctx))
                                                        break;
                                        }
                                }
@@ -127,17 +131,10 @@ namespace Mono.Xml.XPath {
                                return filter.pred.EvaluateBoolean (new NullIterator (node, ctx));
                        }
 
-                       XPathNavigator p = null;
-                       if (previousNavigator == node) {
-                               p = previousNavigator;
-                               p.MoveTo (node);
-                       } else {
-                               p = node.Clone ();
-                               previousNavigator = p;
-                       }
-                       p.MoveToParent ();
+                       tmpNav = ((XsltCompiledContext) ctx).GetNavCache (this, node);
+                       tmpNav.MoveToParent ();
 
-                       BaseIterator matches = filter.EvaluateNodeSet (new NullIterator (p, ctx));
+                       BaseIterator matches = filter.EvaluateNodeSet (new NullIterator (tmpNav, ctx));
                        
                        while (matches.MoveNext ()) {
                                if (node.IsSamePosition (matches.Current))