dbertoni 00/05/05 08:12:18
Modified: c/src/XPath FunctionID.hpp MutableNodeRefList.cpp
MutableNodeRefList.hpp SimpleNodeLocator.cpp
Log:
Changed MutableNodeRefList::addNodeInDocOrder() so that there is no longer a
default for the test parameter.
Revision Changes Path
1.8 +1 -1 xml-xalan/c/src/XPath/FunctionID.hpp
Index: FunctionID.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionID.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionID.hpp 2000/05/03 21:58:03 1.7
+++ FunctionID.hpp 2000/05/05 15:12:17 1.8
@@ -188,7 +188,7 @@
if (theNode != 0)
{
-
theNodeList.addNodeInDocOrder(theNode);
+
theNodeList.addNodeInDocOrder(theNode, true);
}
}
}
1.8 +2 -3 xml-xalan/c/src/XPath/MutableNodeRefList.cpp
Index: MutableNodeRefList.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/MutableNodeRefList.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MutableNodeRefList.cpp 2000/04/19 16:32:49 1.7
+++ MutableNodeRefList.cpp 2000/05/05 15:12:17 1.8
@@ -273,7 +273,7 @@
for(unsigned int i = 0; i < nChildren; i++)
{
- addNodeInDocOrder(nodelist.item(i));
+ addNodeInDocOrder(nodelist.item(i), false);
}
}
@@ -286,8 +286,7 @@
for(unsigned int i = 0; i < nChildren; i++)
{
- addNodeInDocOrder(nodelist.item(i),
- true);
+ addNodeInDocOrder(nodelist.item(i), true);
}
}
1.5 +1 -1 xml-xalan/c/src/XPath/MutableNodeRefList.hpp
Index: MutableNodeRefList.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/MutableNodeRefList.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MutableNodeRefList.hpp 2000/04/11 14:46:09 1.4
+++ MutableNodeRefList.hpp 2000/05/05 15:12:17 1.5
@@ -213,7 +213,7 @@
virtual void
addNodeInDocOrder(
XalanNode* node,
- bool test = false);
+ bool test);
virtual XPathSupport*
getSupport() const;
1.10 +3 -1 xml-xalan/c/src/XPath/SimpleNodeLocator.cpp
Index: SimpleNodeLocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/SimpleNodeLocator.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SimpleNodeLocator.cpp 2000/05/03 21:21:13 1.9
+++ SimpleNodeLocator.cpp 2000/05/05 15:12:17 1.10
@@ -1103,7 +1103,7 @@
if(xpath.s_MatchScoreNone != score)
{
- subQueryResults.addNodeInDocOrder(pos);
+ subQueryResults.addNodeInDocOrder(pos, true);
}
nextNode = pos->getFirstChild();
@@ -1326,6 +1326,8 @@
// XPathExpression interface?
const int argLen =
currentExpression.getOpCodeMapValue(opPos +
XPathExpression::s__opCodeMapLengthIndex + 1) - 3;
+
+ opPos += 3;
if(context != 0 && context->getNodeType() == XalanNode::ELEMENT_NODE)
{
