igorh 2003/08/08 14:55:14
Modified: java/src/org/apache/xalan/xsltc/compiler
UseAttributeSets.java Constants.java
AttributeSet.java
java/src/org/apache/xalan/xsltc/compiler/util
AttributeSetMethodGenerator.java
Log:
Patch for Bugzilla Bug 19918
Revision Changes Path
1.11 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UseAttributeSets.java
Index: UseAttributeSets.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UseAttributeSets.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- UseAttributeSets.java 30 Jan 2003 18:46:02 -0000 1.10
+++ UseAttributeSets.java 8 Aug 2003 21:55:14 -0000 1.11
@@ -135,8 +135,9 @@
if (attrs != null) {
final String methodName = attrs.getMethodName();
il.append(classGen.loadTranslet());
- il.append(methodGen.loadHandler());
+ il.append(methodGen.loadDOM());
il.append(methodGen.loadIterator());
+ il.append(methodGen.loadHandler());
final int method = cpg.addMethodref(classGen.getClassName(),
methodName, ATTR_SET_SIG);
il.append(new INVOKESPECIAL(method));
1.36 +5 -3
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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Constants.java 1 Aug 2003 00:53:03 -0000 1.35
+++ Constants.java 8 Aug 2003 21:55:14 -0000 1.36
@@ -327,7 +327,9 @@
= "doubleValue";
public static final String DOUBLE_VALUE_SIG
= "()D";
-
+
+ public static final String DOM_PNAME
+ = "dom";
public static final String NODE_PNAME
= "node";
public static final String TRANSLET_OUTPUT_PNAME
@@ -369,7 +371,7 @@
= "reset";
public static final String ATTR_SET_SIG
- = "(" + TRANSLET_OUTPUT_SIG + NODE_ITERATOR_SIG + ")V";
+ = "(" + DOM_INTF_SIG + NODE_ITERATOR_SIG + TRANSLET_OUTPUT_SIG + ")V";
public static final String GET_NODE_NAME_SIG
= "(" + NODE_SIG + ")" + STRING_SIG;
1.15 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeSet.java
Index: AttributeSet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeSet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AttributeSet.java 30 Jan 2003 18:45:59 -0000 1.14
+++ AttributeSet.java 8 Aug 2003 21:55:14 -0000 1.15
@@ -191,8 +191,9 @@
final String methodName = _mergeSet.getMethodName();
il.append(classGen.loadTranslet());
- il.append(methodGen.loadHandler());
+ il.append(methodGen.loadDOM());
il.append(methodGen.loadIterator());
+ il.append(methodGen.loadHandler());
final int method = cpg.addMethodref(classGen.getClassName(),
methodName, ATTR_SET_SIG);
il.append(new INVOKESPECIAL(method));
1.6 +21 -13
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/AttributeSetMethodGenerator.java
Index: AttributeSetMethodGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/AttributeSetMethodGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AttributeSetMethodGenerator.java 30 Jan 2003 18:46:09 -0000 1.5
+++ AttributeSetMethodGenerator.java 8 Aug 2003 21:55:14 -0000 1.6
@@ -70,24 +70,30 @@
import org.apache.bcel.generic.InstructionList;
public final class AttributeSetMethodGenerator extends MethodGenerator {
- private static int HANDLER_INDEX = 1;
- private static int ITERATOR_INDEX = 2;
+ private static final int DOM_INDEX = 1;
+ private static final int ITERATOR_INDEX = 2;
+ private static final int HANDLER_INDEX = 3;
private static final org.apache.bcel.generic.Type[] argTypes =
- new org.apache.bcel.generic.Type[2];
- private static final String[] argNames = new String[2];
+ new org.apache.bcel.generic.Type[3];
+ private static final String[] argNames = new String[3];
static {
- argTypes[0] = Util.getJCRefType(TRANSLET_OUTPUT_SIG);
- argNames[0] = TRANSLET_OUTPUT_PNAME;
- argTypes[1] = Util.getJCRefType(NODE_ITERATOR_SIG);
- argNames[1] = ITERATOR_PNAME;
+ argTypes[0] = Util.getJCRefType(DOM_INTF_SIG);
+ argNames[0] = DOM_PNAME;
+ argTypes[1] = Util.getJCRefType(NODE_ITERATOR_SIG);
+ argNames[1] = ITERATOR_PNAME;
+ argTypes[2] = Util.getJCRefType(TRANSLET_OUTPUT_SIG);
+ argNames[2] = TRANSLET_OUTPUT_PNAME;
}
- private final Instruction _astoreHandler;
- private final Instruction _aloadHandler;
+
+ private final Instruction _aloadDom;
+ private final Instruction _astoreDom;
private final Instruction _astoreIterator;
private final Instruction _aloadIterator;
+ private final Instruction _astoreHandler;
+ private final Instruction _aloadHandler;
public AttributeSetMethodGenerator(String methodName, ClassGen classGen)
{
super(org.apache.bcel.Constants.ACC_PRIVATE,
@@ -97,10 +103,12 @@
new InstructionList(),
classGen.getConstantPool());
- _astoreHandler = new ASTORE(HANDLER_INDEX);
- _aloadHandler = new ALOAD(HANDLER_INDEX);
+ _aloadDom = new ALOAD(DOM_INDEX);
+ _astoreDom = new ASTORE(DOM_INDEX);
_astoreIterator = new ASTORE(ITERATOR_INDEX);
_aloadIterator = new ALOAD(ITERATOR_INDEX);
+ _astoreHandler = new ASTORE(HANDLER_INDEX);
+ _aloadHandler = new ALOAD(HANDLER_INDEX);
}
public Instruction storeIterator() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
