You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by ga...@locus.apache.org on 2000/11/02 18:21:51 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath/axes WalkerFactory.java
garyp 00/11/02 09:21:50
Modified: java/src/org/apache/xpath/axes WalkerFactory.java
Log:
Eliminate unneded calls to Compiler.getWhatToShow()
Revision Changes Path
1.3 +26 -18 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WalkerFactory.java 2000/10/30 18:58:57 1.2
+++ WalkerFactory.java 2000/11/02 17:21:47 1.3
@@ -248,8 +248,6 @@
{
stepCount++;
- int whatToShow = compiler.getWhatToShow(stepOpCodePos);
-
// String namespace = compiler.getStepNS(stepOpCodePos);
// boolean isNSWild = (null != namespace)
// ? namespace.equals(NodeTest.WILD) : false;
@@ -284,6 +282,7 @@
case OpCodes.FROM_CHILDREN :
if (1 == stepCount)
{
+ int whatToShow = compiler.getWhatToShow(stepOpCodePos);
if (whatToShow == NodeFilter.SHOW_ALL)
{
@@ -405,7 +404,6 @@
{
AxesWalker ai;
- int whatToShow = compiler.getWhatToShow(opPos);
int stepType = compiler.getOp(opPos);
boolean debug = false;
@@ -430,7 +428,6 @@
break;
case OpCodes.FROM_ROOT :
ai = new RootWalker(lpi);
- simpleInit = true;
break;
case OpCodes.FROM_ANCESTORS :
ai = new AncestorWalker(lpi);
@@ -519,23 +516,34 @@
+ stepType);
}
- /*
- System.out.print("construct: ");
- NodeTest.debugWhatToShow(whatToShow);
- System.out.println("or stuff: "+(whatToShow & (NodeFilter.SHOW_ATTRIBUTE
- | NodeFilter.SHOW_ELEMENT
- | NodeFilter.SHOW_PROCESSING_INSTRUCTION)));
- */
- if ((0 == (whatToShow
- & (NodeFilter.SHOW_ATTRIBUTE | NodeFilter.SHOW_ELEMENT
- | NodeFilter.SHOW_PROCESSING_INSTRUCTION))) || (whatToShow == NodeFilter.SHOW_ALL))
- ai.initNodeTest(whatToShow);
- else
+ if (simpleInit)
{
- ai.initNodeTest(whatToShow, compiler.getStepNS(opPos),
- compiler.getStepLocalName(opPos));
+ ai.initNodeTest(NodeFilter.SHOW_ALL);
}
+ else
+ {
+
+ int whatToShow = compiler.getWhatToShow(opPos);
+ /*
+ System.out.print("construct: ");
+ NodeTest.debugWhatToShow(whatToShow);
+ System.out.println("or stuff: "+(whatToShow & (NodeFilter.SHOW_ATTRIBUTE
+ | NodeFilter.SHOW_ELEMENT
+ | NodeFilter.SHOW_PROCESSING_INSTRUCTION)));
+ */
+
+ if ((0 == (whatToShow
+ & (NodeFilter.SHOW_ATTRIBUTE | NodeFilter.SHOW_ELEMENT
+ | NodeFilter.SHOW_PROCESSING_INSTRUCTION))) || (whatToShow == NodeFilter.SHOW_ALL))
+ ai.initNodeTest(whatToShow);
+ else
+ {
+ ai.initNodeTest(whatToShow, compiler.getStepNS(opPos),
+ compiler.getStepLocalName(opPos));
+ }
+ }
+
return ai;
}
}