Miroirs/arabica
1
0
Fork 0
mirror of https://github.com/jezhiggins/arabica synced 2025-01-30 08:38:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

improved preceding and preceding-sibling in the face of consecutive text nodes

Browse source
This commit is contained in:
jez 2008-09-18 22:43:56 +01:00
parent 9cbe2c1621
commit 93549c451d
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
include/XPath/impl/xpath_axis_enumerator.hpp
View file

@ -146,6 +146,23 @@ protected:
return next; return next;
} // findNextSibling } // 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: private:
static bool nodeIsText(const DOM::Node<string_type, string_adaptor>& node) 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> 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) if(next != 0)
return getLastDescendant(next); return getLastDescendant(next);
@ -567,13 +584,13 @@ public:
PrecedingSiblingAxisWalker(const DOM::Node<string_type, string_adaptor>& context) : AxisWalker<string_type, string_adaptor>(false) PrecedingSiblingAxisWalker(const DOM::Node<string_type, string_adaptor>& context) : AxisWalker<string_type, string_adaptor>(false)
{ {
if(context != 0) 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 } // PrecedingSiblingAxisWalker
virtual void advance() virtual void advance()
{ {
if(AxisWalker<string_type, string_adaptor>::get() != 0) 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 } // advance
virtual AxisWalker<string_type, string_adaptor>* clone() const { return new PrecedingSiblingAxisWalker(*this); } virtual AxisWalker<string_type, string_adaptor>* clone() const { return new PrecedingSiblingAxisWalker(*this); }