XPath: Added xpath_node_set constructor, redesigned evaluation memory management (alternating stacks instead of heap)

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

1 files changed, 6 insertions, 14 deletions

diff --git a/src/pugixml.hpp b/src/pugixml.hpp
index 07f6308..fbb9fcc 100644
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@@ -2068,8 +2068,6 @@ namespace pugi
 	 */
 	class PUGIXML_CLASS xpath_node_set
 	{
-		friend class xpath_ast_node;
-		
 	public:
 		/// Collection type
 		enum type_t
@@ -2089,20 +2087,9 @@ namespace pugi
 		
 		xpath_node* _begin;
 		xpath_node* _end;
-		xpath_node* _eos;
-		
-		typedef xpath_node* iterator;
 
-		iterator mut_begin();
-		
-		void push_back(const xpath_node& n);
+		void _assign(const_iterator begin, const_iterator end);
 		
-		void append(const_iterator begin, const_iterator end);
-		
-		void truncate(iterator it);
-
-		void remove_duplicates();
-
 	public:
 		/**
 		 * Default constructor
@@ -2111,6 +2098,11 @@ namespace pugi
 		xpath_node_set();
 
 		/**
+		 * Constructor from contents
+		 */
+		xpath_node_set(const_iterator begin, const_iterator end, type_t type = type_unsorted);
+
+		/**
          * Destructor
          */
 		~xpath_node_set();