diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-05-29 22:52:40 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-05-29 22:52:40 +0000 |
| commit | c436c32e6c544cd1cdbf16ddf407fff382a4ade7 (patch) | |
| tree | 933d71f34f28749f11a72d007cafbc66bf020f8e /src | |
| parent | 43fc0ca13bf30596aa206edd9511b94a337986ca (diff) | |
Fixed descendant-or-self axis for attributes
git-svn-id: http://pugixml.googlecode.com/svn/trunk@468 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'src')
| -rw-r--r-- | src/pugixpath.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/pugixpath.cpp b/src/pugixpath.cpp index 94498bc..493b6e5 100644 --- a/src/pugixpath.cpp +++ b/src/pugixpath.cpp @@ -1751,6 +1751,15 @@ namespace pugi break;
}
+ case axis_descendant_or_self:
+ {
+ ns.m_type = ns.empty() ? xpath_node_set::type_sorted : xpath_node_set::type_unsorted;
+
+ step_push(ns, a, p);
+
+ break;
+ }
+
case axis_following:
{
ns.m_type = ns.empty() ? xpath_node_set::type_sorted : xpath_node_set::type_unsorted;
@@ -1858,6 +1867,7 @@ namespace pugi case axis_ancestor:
case axis_ancestor_or_self:
+ case axis_descendant_or_self:
case axis_following:
case axis_preceding:
if (m_left)
@@ -1891,7 +1901,6 @@ namespace pugi case axis_attribute:
case axis_child:
case axis_descendant:
- case axis_descendant_or_self:
if (m_left)
{
xpath_node_set s = m_left->eval_node_set(c);
|