You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mm...@locus.apache.org on 2000/08/07 23:26:27 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath/patterns AncestorStepPattern.java StepPattern.java
mmidy 00/08/07 14:26:27
Modified: java/src/org/apache/xpath/compiler Compiler.java
java/src/org/apache/xpath/patterns AncestorStepPattern.java
StepPattern.java
Log:
Fix ancestor match pattern processing
Revision Changes Path
1.3 +1 -1 xml-xalan/java/src/org/apache/xpath/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/Compiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Compiler.java 2000/07/30 22:39:43 1.2
+++ Compiler.java 2000/08/07 21:26:22 1.3
@@ -607,7 +607,7 @@
case OpCodes.MATCH_ANY_ANCESTOR:
argLen = getArgLengthOfStep(opPos);
opPos = getFirstChildPosOfStep(opPos);
- pattern = new StepPattern(getWhatToShow(startOpPos),
+ pattern = new AncestorStepPattern(getWhatToShow(startOpPos),
getStepNS(startOpPos),
getStepLocalName(startOpPos));
break;
1.2 +1 -1 xml-xalan/java/src/org/apache/xpath/patterns/AncestorStepPattern.java
Index: AncestorStepPattern.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/AncestorStepPattern.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AncestorStepPattern.java 2000/07/05 14:48:55 1.1
+++ AncestorStepPattern.java 2000/08/07 21:26:24 1.2
@@ -32,7 +32,7 @@
try
{
xctxt.pushCurrentNode(parent);
- score = m_relativePathPattern.execute(xctxt);
+ score = execute(xctxt);
if(score != NodeTest.SCORE_NONE)
{
score = SCORE_OTHER;
1.2 +1 -1 xml-xalan/java/src/org/apache/xpath/patterns/StepPattern.java
Index: StepPattern.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/StepPattern.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StepPattern.java 2000/07/05 14:48:55 1.1
+++ StepPattern.java 2000/08/07 21:26:25 1.2
@@ -215,7 +215,7 @@
if((score != NodeTest.SCORE_NONE) && (null != m_relativePathPattern))
{
- score = executeRelativePathPattern(xctxt);
+ score = m_relativePathPattern.executeRelativePathPattern(xctxt);
}
return score;
}