santiagopg 02/04/26 11:11:24
Modified: java/src/org/apache/xalan/xsltc/compiler Constants.java
FilterParentPath.java ParentLocationPath.java
Log:
Replaced STEP_ITERATOR by NODE_ITERATOR_BASE when calling includeSelf().
Revision Changes Path
1.21 +3 -1
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Constants.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Constants.java 24 Apr 2002 17:03:15 -0000 1.20
+++ Constants.java 26 Apr 2002 18:11:24 -0000 1.21
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Constants.java,v 1.20 2002/04/24 17:03:15 santiagopg Exp $
+ * @(#)$Id: Constants.java,v 1.21 2002/04/26 18:11:24 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -147,6 +147,8 @@
= "int";
public static final String NODE_ITERATOR
= "org.apache.xalan.xsltc.NodeIterator";
+ public static final String NODE_ITERATOR_BASE
+ = "org.apache.xalan.xsltc.dom.NodeIteratorBase";
public static final String SORT_ITERATOR
= "org.apache.xalan.xsltc.dom.SortingIterator";
public static final String SORT_ITERATOR_SIG
1.10 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilterParentPath.java
Index: FilterParentPath.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilterParentPath.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FilterParentPath.java 1 Feb 2002 20:07:08 -0000 1.9
+++ FilterParentPath.java 26 Apr 2002 18:11:24 -0000 1.10
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: FilterParentPath.java,v 1.9 2002/02/01 20:07:08 tmiller Exp $
+ * @(#)$Id: FilterParentPath.java,v 1.10 2002/04/26 18:11:24 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -149,9 +149,9 @@
// This is a special case for the //* path with or without predicates
if (_hasDescendantAxis) {
- final int incl = cpg.addMethodref(STEP_ITERATOR_CLASS,
+ final int incl = cpg.addMethodref(NODE_ITERATOR_BASE,
"includeSelf",
- "()"+NODE_ITERATOR_SIG);
+ "()" + NODE_ITERATOR_SIG);
il.append(new INVOKEVIRTUAL(incl));
}
1.18 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java
Index: ParentLocationPath.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ParentLocationPath.java 24 Apr 2002 17:03:15 -0000 1.17
+++ ParentLocationPath.java 26 Apr 2002 18:11:24 -0000 1.18
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ParentLocationPath.java,v 1.17 2002/04/24 17:03:15 santiagopg
Exp $
+ * @(#)$Id: ParentLocationPath.java,v 1.18 2002/04/26 18:11:24 santiagopg
Exp $
*
* The Apache Software License, Version 1.1
*
@@ -223,9 +223,9 @@
if ((path == Axis.DESCENDANTORSELF && step == Axis.CHILD) ||
(path == Axis.DESCENDANTORSELF && step == Axis.ATTRIBUTE) ||
(path == Axis.PRECEDING && step == Axis.PARENT)) {
- final int incl = cpg.addMethodref(STEP_ITERATOR_CLASS,
+ final int incl = cpg.addMethodref(NODE_ITERATOR_BASE,
"includeSelf",
- "()"+NODE_ITERATOR_SIG);
+ "()" + NODE_ITERATOR_SIG);
il.append(new INVOKEVIRTUAL(incl));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
