From 7554e206885a3f3aa1a771f0d4ca1d4a921994ad Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine" Date: Sun, 29 Aug 2010 15:27:29 +0000 Subject: XPath: Context node for evaluate is now an xpath_node (can use attribute contexts) git-svn-id: http://pugixml.googlecode.com/svn/trunk@663 99668b35-9821-0410-8761-19e4c4f06640 --- src/pugixml.hpp | 10 +++++----- src/pugixpath.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pugixml.hpp b/src/pugixml.hpp index cb6180c..40c3b98 100644 --- a/src/pugixml.hpp +++ b/src/pugixml.hpp @@ -1999,7 +1999,7 @@ namespace pugi * \param n - context node * \return evaluation result */ - bool evaluate_boolean(const xml_node& n) const; + bool evaluate_boolean(const xpath_node& n) const; /** * Evaluate expression as double value for the context node \a n. @@ -2010,7 +2010,7 @@ namespace pugi * \param n - context node * \return evaluation result */ - double evaluate_number(const xml_node& n) const; + double evaluate_number(const xpath_node& n) const; #ifndef PUGIXML_NO_STL /** @@ -2022,7 +2022,7 @@ namespace pugi * \param n - context node * \return evaluation result */ - string_t evaluate_string(const xml_node& n) const; + string_t evaluate_string(const xpath_node& n) const; #endif /** @@ -2034,7 +2034,7 @@ namespace pugi * \param n - context node * \return evaluation result */ - size_t evaluate_string(char_t* buffer, size_t capacity, const xml_node& n) const; + size_t evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const; /** * Evaluate expression as node set for the context node \a n. @@ -2044,7 +2044,7 @@ namespace pugi * \param n - context node * \return evaluation result */ - xpath_node_set evaluate_node_set(const xml_node& n) const; + xpath_node_set evaluate_node_set(const xpath_node& n) const; // Get parsing result const xpath_parse_result& result() const; diff --git a/src/pugixpath.cpp b/src/pugixpath.cpp index 14315ca..248e9a4 100644 --- a/src/pugixpath.cpp +++ b/src/pugixpath.cpp @@ -3748,7 +3748,7 @@ namespace pugi return _root->rettype(); } - bool xpath_query::evaluate_boolean(const xml_node& n) const + bool xpath_query::evaluate_boolean(const xpath_node& n) const { if (!_root) return false; @@ -3757,7 +3757,7 @@ namespace pugi return _root->eval_boolean(c); } - double xpath_query::evaluate_number(const xml_node& n) const + double xpath_query::evaluate_number(const xpath_node& n) const { if (!_root) return gen_nan(); @@ -3767,7 +3767,7 @@ namespace pugi } #ifndef PUGIXML_NO_STL - string_t xpath_query::evaluate_string(const xml_node& n) const + string_t xpath_query::evaluate_string(const xpath_node& n) const { if (!_root) return string_t(); @@ -3777,7 +3777,7 @@ namespace pugi } #endif - size_t xpath_query::evaluate_string(char_t* buffer, size_t capacity, const xml_node& n) const + size_t xpath_query::evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const { xpath_context c(n, 1, 1); xpath_string r = _root ? _root->eval_string(c) : xpath_string(); @@ -3790,7 +3790,7 @@ namespace pugi return size; } - xpath_node_set xpath_query::evaluate_node_set(const xml_node& n) const + xpath_node_set xpath_query::evaluate_node_set(const xpath_node& n) const { if (!_root) return xpath_node_set(); -- cgit v1.2.3