sboag 01/05/26 20:45:09
Modified: java/src/org/apache/xpath/axes Tag: DTM_EXP
DescendantIterator.java
Log:
Backed out of change from main branch. I already fixed the bug, and liked my
fix better.
Revision Changes Path
No revision
No revision
1.8.2.7 +3 -8
xml-xalan/java/src/org/apache/xpath/axes/DescendantIterator.java
Index: DescendantIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/DescendantIterator.java,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -u -r1.8.2.6 -r1.8.2.7
--- DescendantIterator.java 2001/05/27 03:05:16 1.8.2.6
+++ DescendantIterator.java 2001/05/27 03:45:09 1.8.2.7
@@ -99,24 +99,19 @@
int ops[] = compiler.getOpMap();
int firstStepPos = compiler.getFirstChildPos(opPos);
int stepType = ops[firstStepPos];
- /** Bit is on if any of the walkers contain a child step. */
- final int BIT_CHILD = (0x00001000 << 4);
- if (OpCodes.FROM_DESCENDANTS_OR_SELF == stepType)
- m_orSelf = (BIT_CHILD == (analysis & BIT_CHILD)) ? false : true;
+ m_orSelf = (OpCodes.FROM_DESCENDANTS_OR_SELF == stepType);
if (OpCodes.FROM_SELF == stepType)
{
- m_orSelf = (BIT_CHILD == (analysis & BIT_CHILD)) ? false : true;
+ m_orSelf = true;
firstStepPos += 8;
}
else if(OpCodes.FROM_ROOT == stepType)
{
m_fromRoot = true;
- m_orSelf = (BIT_CHILD == (analysis & BIT_CHILD)) ? false : true;
+ m_orSelf = true;
firstStepPos += 8;
}
- else
- m_orSelf = false;
int whatToShow = compiler.getWhatToShow(firstStepPos);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
