garyp 00/11/08 18:30:18
Modified: java/src/org/apache/xpath/axes WalkerFactory.java
Log:
Explicitly test for child::node() before considering ChildIterator.
The old test for a NodeFilter doesn't work anymore because
getWhatToShow now returns more specific information.
Revision Changes Path
1.5 +1 -3
xml-xalan/java/src/org/apache/xpath/axes/WalkerFactory.java
Index: WalkerFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/WalkerFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WalkerFactory.java 2000/11/08 16:56:10 1.4
+++ WalkerFactory.java 2000/11/09 02:30:18 1.5
@@ -282,10 +282,8 @@
case OpCodes.FROM_CHILDREN :
if (1 == stepCount)
{
- int whatToShow = compiler.getWhatToShow(stepOpCodePos);
- if (whatToShow == NodeFilter.SHOW_ALL)
+ if (OpCodes.NODETYPE_NODE == ops[stepOpCodePos+3]) //
child::node()
{
-
// System.out.println("ONESTEP_CHILDREN_ANY");
if(predAnalysis == HAS_NOPREDICATE)
analysisResult = ONESTEP_CHILDREN_ANY;
