dbertoni 01/01/26 08:25:01
Modified: c/src/XPath XPathProcessorImpl.cpp
Log:
Fixed bug with using NCName with the namespace axis.
Revision Changes Path
1.31 +16 -16 xml-xalan/c/src/XPath/XPathProcessorImpl.cpp
Index: XPathProcessorImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathProcessorImpl.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- XPathProcessorImpl.cpp 2001/01/25 17:14:21 1.30
+++ XPathProcessorImpl.cpp 2001/01/26 16:25:00 1.31
@@ -2027,22 +2027,6 @@
}
else
{
- if (axisType ==
XPathExpression::eFROM_NAMESPACE)
- {
- const XObject* const theToken =
-
m_expression->getRelativeToken(-1);
- assert(theToken != 0);
-
- const XalanDOMString& theString =
theToken->str();
-
- const XalanDOMString& theNamespace =
-
m_prefixResolver->getNamespaceForPrefix(theString);
-
- m_expression->replaceRelativeToken(
- -1,
-
theNamespace);
- }
-
m_expression->pushCurrentTokenOnOpCodeMap();
}
@@ -2061,6 +2045,22 @@
}
else
{
+ if (axisType == XPathExpression::eFROM_NAMESPACE)
+ {
+ const XObject* const theToken =
+
m_expression->getRelativeToken(-1);
+ assert(theToken != 0);
+
+ const XalanDOMString& theString =
theToken->str();
+
+ const XalanDOMString& theNamespace =
+
m_prefixResolver->getNamespaceForPrefix(theString);
+
+ m_expression->replaceRelativeToken(
+ -1,
+
theNamespace);
+ }
+
m_expression->pushCurrentTokenOnOpCodeMap();
}
