From 8a2b87e6e1f5cd8784130f3cfcd1911b214c55cc Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 16 May 2007 05:37:46 +0000 Subject: Changed scope resolution to use the new value_t. --- src/xpath.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/xpath.h') diff --git a/src/xpath.h b/src/xpath.h index 5433223d..0bb234a5 100644 --- a/src/xpath.h +++ b/src/xpath.h @@ -84,12 +84,11 @@ public: public: virtual void define(const string& name, ptr_op_t def); - // jww (2007-05-15): ?? - virtual bool resolve(const string& name, value_t& result, - scope_t * locals = NULL) { + virtual optional resolve(const string& name, + scope_t * locals = NULL) { if (parent) - return parent->resolve(name, result, locals); - return false; + return parent->resolve(name, locals); + return none; } virtual ptr_op_t lookup(const string& name); @@ -116,8 +115,8 @@ public: : scope_t(_parent, STATIC), node(_node), index(_index), size(_size) {} - virtual bool resolve(const string& name, value_t& result, - scope_t * locals = NULL); + virtual optional resolve(const string& name, + scope_t * locals = NULL); }; #define XPATH_PARSE_NORMAL 0x00 -- cgit v1.2.3