dbertoni 2003/09/03 23:48:37
Modified: c/src/xalanc/XalanExtensions FunctionEvaluate.cpp
Log:
Pass Locators through.
Revision Changes Path
1.2 +16 -13
xml-xalan/c/src/xalanc/XalanExtensions/FunctionEvaluate.cpp
Index: FunctionEvaluate.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanExtensions/FunctionEvaluate.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionEvaluate.cpp 29 Jun 2003 03:58:20 -0000 1.1
+++ FunctionEvaluate.cpp 4 Sep 2003 06:48:37 -0000 1.2
@@ -96,10 +96,11 @@
inline XObjectPtr
doExecute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XalanDOMString& expression,
- const PrefixResolver& resolver)
+ XPathExecutionContext&
executionContext,
+ XalanNode*
context,
+ const XalanDOMString& expression,
+ const PrefixResolver& resolver,
+ const Function::LocatorType* locator)
{
// $$$ ToDo: Consider moving all of this into a member function of
// XPathExecutionContext.
@@ -107,13 +108,14 @@
XPathConstructionContextDefault theConstructionContext;
- XPath
theXPath;
+ XPath
theXPath(locator);
theProcessor.initXPath(
theXPath,
theConstructionContext,
expression,
- resolver);
+ resolver,
+ locator);
return theXPath.execute(context, resolver, executionContext);
}
@@ -122,10 +124,11 @@
inline XObjectPtr
doExecute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XalanDOMString& expression,
- const XalanNode* resolver)
+ XPathExecutionContext&
executionContext,
+ XalanNode*
context,
+ const XalanDOMString& expression,
+ const XalanNode*
resolver,
+ const Function::LocatorType* locator)
{
assert(resolver == 0 || resolver->getNodeType() ==
XalanNode::ELEMENT_NODE);
@@ -135,7 +138,7 @@
ElementPrefixResolverProxy theProxy(static_cast<const
XalanElement*>(resolver));
#endif
- return doExecute(executionContext, context, expression, theProxy);
+ return doExecute(executionContext, context, expression, theProxy,
locator);
}
@@ -161,7 +164,7 @@
if (theResolver != 0)
{
- return doExecute(executionContext, context, theExpression,
*theResolver);
+ return doExecute(executionContext, context, theExpression,
*theResolver, locator);
}
else
{
@@ -182,7 +185,7 @@
}
}
- return doExecute(executionContext, context, theExpression,
resolverNode);
+ return doExecute(executionContext, context, theExpression,
resolverNode, locator);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
