XPath: Restored document order sorting optimization (it's now automatic for nodes that were loaded and not significantly altered), minor traversal optimizations

git-svn-id: http://pugixml.googlecode.com/svn/trunk@613 99668b35-9821-0410-8761-19e4c4f06640

1 files changed, 30 insertions, 37 deletions

diff --git a/src/pugixpath.cpp b/src/pugixpath.cpp
index 775706c..e9b7bc0 100644
--- a/src/pugixpath.cpp
+++ b/src/pugixpath.cpp
@@ -143,28 +143,22 @@ namespace
 
 				xml_node cur = n.first_child();
 				
-				if (cur)
+				while (cur && cur != n)
 				{
-					do 
+					if (cur.type() == node_pcdata || cur.type() == node_cdata)
+						result += cur.value();
+
+					if (cur.first_child())
+						cur = cur.first_child();
+					else if (cur.next_sibling())
+						cur = cur.next_sibling();
+					else
 					{
-						if (cur.type() == node_pcdata || cur.type() == node_cdata)
-							result += cur.value();
-						
-						if (cur.first_child())
-							cur = cur.first_child();
-						else if (cur.next_sibling())
-							cur = cur.next_sibling();
-						else
-						{
-							// Borland C++ workaround
-							while (!cur.next_sibling() && cur != n && (bool)cur.parent())
-								cur = cur.parent();
-						
-							if (cur != n)
-								cur = cur.next_sibling();
-						}
+						while (!cur.next_sibling() && cur != n)
+							cur = cur.parent();
+
+						if (cur != n) cur = cur.next_sibling();
 					}
-					while (cur && cur != n);
 				}
 				
 				return result;
@@ -228,6 +222,11 @@ namespace
 		{
 			xml_node ln = lhs.node(), rn = rhs.node();
 
+			const void* lo = lhs.attribute() ? lhs.attribute().document_order() : ln.document_order();
+			const void* ro = rhs.attribute() ? rhs.attribute().document_order() : rn.document_order();
+
+			if (lo && ro) return lo < ro;
+
 			if (lhs.attribute() && rhs.attribute())
 			{
 				if (lhs.parent() == rhs.parent())
@@ -1642,27 +1641,21 @@ namespace pugi
 					
 				xml_node cur = n.first_child();
 				
-				if (cur)
+				while (cur && cur != n)
 				{
-					do 
+					step_push(ns, cur);
+					
+					if (cur.first_child())
+						cur = cur.first_child();
+					else if (cur.next_sibling())
+						cur = cur.next_sibling();
+					else
 					{
-						step_push(ns, cur);
-						
-						if (cur.first_child())
-							cur = cur.first_child();
-						else if (cur.next_sibling())
-							cur = cur.next_sibling();
-						else
-						{
-							// Borland C++ workaround
-							while (!cur.next_sibling() && cur != n && (bool)cur.parent())
-								cur = cur.parent();
-						
-							if (cur != n)
-								cur = cur.next_sibling();
-						}
+						while (!cur.next_sibling() && cur != n)
+							cur = cur.parent();
+					
+						if (cur != n) cur = cur.next_sibling();
 					}
-					while (cur && cur != n);
 				}
 				
 				break;