From 93549c451d65ca37eaaf30c205d231a9767fa816 Mon Sep 17 00:00:00 2001
From: jez <jez@ISLA>
Date: Thu, 18 Sep 2008 22:43:56 +0100
Subject: [PATCH] improved preceding and preceding-sibling in the face of
 consecutive text nodes

---
 include/XPath/impl/xpath_axis_enumerator.hpp | 23 +++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/include/XPath/impl/xpath_axis_enumerator.hpp b/include/XPath/impl/xpath_axis_enumerator.hpp
index b99c928a..ba09a589 100644
--- a/include/XPath/impl/xpath_axis_enumerator.hpp
+++ b/include/XPath/impl/xpath_axis_enumerator.hpp
@@ -146,6 +146,23 @@ protected:
     return next;
   } // findNextSibling
 
+  static DOM::Node<string_type, string_adaptor> findPreviousSibling(const DOM::Node<string_type, string_adaptor>& node)
+  {
+    DOM::Node<string_type, string_adaptor> prev = node.getPreviousSibling();
+
+    if((prev == 0) || (!nodeIsText(prev)))
+      return prev;
+
+    DOM::Node<string_type, string_adaptor> prev_again = prev.getPreviousSibling();
+    while((prev_again != 0) && (nodeIsText(prev_again)))
+    {
+      prev = prev_again;
+      prev_again = prev.getPreviousSibling();
+    } // while
+
+    return prev;
+  } // findPreviousSibling
+
 private:
   static bool nodeIsText(const DOM::Node<string_type, string_adaptor>& node)
   {
@@ -525,7 +542,7 @@ private:
 
   DOM::Node<string_type, string_adaptor> previousInDocument(const DOM::Node<string_type, string_adaptor>& context)
   {
-    DOM::Node<string_type, string_adaptor> next = context.getPreviousSibling();
+    DOM::Node<string_type, string_adaptor> next = AxisWalker<string_type, string_adaptor>::findPreviousSibling(context);
     if(next != 0)
       return getLastDescendant(next);
 
@@ -567,13 +584,13 @@ public:
   PrecedingSiblingAxisWalker(const DOM::Node<string_type, string_adaptor>& context) : AxisWalker<string_type, string_adaptor>(false)
   {
     if(context != 0)
-      AxisWalker<string_type, string_adaptor>::set(context.getPreviousSibling());
+      AxisWalker<string_type, string_adaptor>::set(AxisWalker<string_type, string_adaptor>::findPreviousSibling(context));
   } // PrecedingSiblingAxisWalker
 
   virtual void advance()
   {
     if(AxisWalker<string_type, string_adaptor>::get() != 0)
-      AxisWalker<string_type, string_adaptor>::set(AxisWalker<string_type, string_adaptor>::get().getPreviousSibling());
+      AxisWalker<string_type, string_adaptor>::set(AxisWalker<string_type, string_adaptor>::findPreviousSibling(AxisWalker<string_type, string_adaptor>::get()));
   } // advance
   virtual AxisWalker<string_type, string_adaptor>* clone() const { return new PrecedingSiblingAxisWalker(*this); }