morten 01/07/31 11:13:23
Modified: java/src/org/apache/xalan/xsltc/compiler VariableBase.java
java/src/org/apache/xalan/xsltc/runtime
DefaultSAXOutputHandler.java
Log:
Removed some of the linefeeds we output in the default SAX output handler
to produce output more similar to Saxon (for testing purposes).
Added a test for null-pointers in the new VariableBase class.
PR: bugzilla 2922 & 2598
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableBase.java
Index: VariableBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VariableBase.java 2001/07/31 09:13:13 1.1
+++ VariableBase.java 2001/07/31 18:13:23 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: VariableBase.java,v 1.1 2001/07/31 09:13:13 morten Exp $
+ * @(#)$Id: VariableBase.java,v 1.2 2001/07/31 18:13:23 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -126,7 +126,7 @@
* Called when we leave the AST scope of the variable's declaration
*/
public void unmapRegister(MethodGenerator methodGen) {
- if (_refs.isEmpty()) {
+ if (_refs.isEmpty() && (_local != null)) {
_local.setEnd(methodGen.getInstructionList().getEnd());
methodGen.removeLocalVariable(_local);
_refs = null;
1.10 +5 -6
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/DefaultSAXOutputHandler.java
Index: DefaultSAXOutputHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/DefaultSAXOutputHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultSAXOutputHandler.java 2001/07/30 13:35:41 1.9
+++ DefaultSAXOutputHandler.java 2001/07/31 18:13:23 1.10
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: DefaultSAXOutputHandler.java,v 1.9 2001/07/30 13:35:41 morten
Exp $
+ * @(#)$Id: DefaultSAXOutputHandler.java,v 1.10 2001/07/31 18:13:23 morten
Exp $
*
* The Apache Software License, Version 1.1
*
@@ -103,9 +103,9 @@
// Commonly used strings are stored as char arrays for speed
private static final char[] BEGPI = "<?".toCharArray();
private static final char[] ENDPI = "?>".toCharArray();
- private static final char[] GT_CR = ">\n".toCharArray();
+ private static final char[] GT_CR = ">".toCharArray();
private static final char[] GT_LT_SL = "></".toCharArray();
- private static final char[] SL_GT = "/>\n".toCharArray();
+ private static final char[] SL_GT = "/>".toCharArray();
private static final char[] XMLNS = " xmlns".toCharArray();
// All of these are used to control/track output indentation
@@ -316,15 +316,14 @@
char[] endTag = (char[])_endTags.get(elementName);
if (endTag == null) {
// We dont' want to concatenate String objects!!!!
- // endTag = ("</"+elementName+">\n").toCharArray();
+ // endTag = ("</"+elementName+">").toCharArray();
final int len = elementName.length();
final char[] src = elementName.toCharArray();
- endTag = new char[len+4];
+ endTag = new char[len+3];
System.arraycopy(src, 0, endTag, 2, len);
endTag[0] = '<';
endTag[1] = '/';
endTag[len+2] = '>';
- endTag[len+3] = '\n';
_endTags.put(elementName,endTag);
}
_writer.write(endTag);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
