morten 01/10/17 02:43:12
Modified: java/src/org/apache/xalan/xsltc/compiler LiteralElement.java
Mode.java
java/src/org/apache/xalan/xsltc/dom DOMImpl.java
Log:
A fix to a recent regression after a fix for some axis iterators.
PR: n/a
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.12 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralElement.java
Index: LiteralElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralElement.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LiteralElement.java 2001/09/17 08:20:54 1.11
+++ LiteralElement.java 2001/10/17 09:43:12 1.12
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: LiteralElement.java,v 1.11 2001/09/17 08:20:54 morten Exp $
+ * @(#)$Id: LiteralElement.java,v 1.12 2001/10/17 09:43:12 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -367,7 +367,7 @@
final String prefix = (String)e.nextElement();
final String uri = (String)_accessedPrefixes.get(prefix);
if ((uri != Constants.EMPTYSTRING) ||
- (prefix == Constants.EMPTYSTRING)) {
+ (prefix != Constants.EMPTYSTRING)) {
il.append(methodGen.loadHandler());
il.append(new PUSH(cpg,prefix));
il.append(new PUSH(cpg,uri));
1.11 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Mode.java
Index: Mode.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Mode.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Mode.java 2001/10/16 11:35:29 1.10
+++ Mode.java 2001/10/17 09:43:12 1.11
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Mode.java,v 1.10 2001/10/16 11:35:29 morten Exp $
+ * @(#)$Id: Mode.java,v 1.11 2001/10/17 09:43:12 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -631,7 +631,7 @@
// (*) Handle template with explicit "@*" pattern
final TestSeq attrTest = _testSeq[DOM.ATTRIBUTE];
- InstructionHandle ihAttr = ihLoop;
+ InstructionHandle ihAttr = ihText;
if (attrTest != null)
ihAttr = attrTest.compile(classGen, methodGen, ihAttr);
1.49 +4 -8
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMImpl.java
Index: DOMImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMImpl.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- DOMImpl.java 2001/10/16 12:02:25 1.48
+++ DOMImpl.java 2001/10/17 09:43:12 1.49
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: DOMImpl.java,v 1.48 2001/10/16 12:02:25 morten Exp $
+ * @(#)$Id: DOMImpl.java,v 1.49 2001/10/17 09:43:12 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -62,11 +62,6 @@
*
*/
-/* Issues to resolve:
- o) All stacks in the DOMBuilder class have hardcoded length
- o) There are no namespace nodes (but namespace are handled correctly).
-*/
-
package org.apache.xalan.xsltc.dom;
import java.io.Externalizable;
@@ -921,8 +916,9 @@
if (isElement(node)) {
_attribute = _lengthOrAttr[_startNode = node];
// Skip namespace nodes
- while (_type[_attribute] == NAMESPACE)
+ while (_type[_attribute] == NAMESPACE) {
_attribute = _nextSibling[_attribute];
+ }
}
else {
_attribute = NULL;
@@ -1268,7 +1264,7 @@
public int next() {
final int node = _node + 1;
- return node < _treeNodeLimit ? returnNode(_node = node) : NULL;
+ return node < _firstAttributeNode ? returnNode(_node = node) : NULL;
}
public void setMark() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
