zongaro 2002/09/18 08:56:48
Modified: java/src/org/apache/xalan/xsltc/cmdline Tag: XSLTC_DTM
Compile.java
java/src/org/apache/xalan/xsltc/compiler Tag: XSLTC_DTM
XSLTC.java
java/src/org/apache/xalan/xsltc/compiler/util Tag: XSLTC_DTM
ErrorMessages.java
java/src/org/apache/xalan/xsltc/trax Tag: XSLTC_DTM
TransformerFactoryImpl.java
Log:
Folding changes from MAIN branch back into this branch.
Revision Changes Path
No revision
No revision
1.8.10.3 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/Compile.java
Index: Compile.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/Compile.java,v
retrieving revision 1.8.10.2
retrieving revision 1.8.10.3
diff -u -r1.8.10.2 -r1.8.10.3
--- Compile.java 12 Sep 2002 16:07:33 -0000 1.8.10.2
+++ Compile.java 18 Sep 2002 15:56:48 -0000 1.8.10.3
@@ -83,7 +83,7 @@
// Versioning numbers for the compiler -v option output
private static int VERSION_MAJOR = 1;
private static int VERSION_MINOR = 2;
- private static int VERSION_DELTA = 0;
+ private static int VERSION_DELTA = 1;
// This variable should be set to false to prevent any methods in this
@@ -148,7 +148,7 @@
_allowExit = false;
break;
case 'n':
- xsltc.setTemplateInlining(false);
+ xsltc.setTemplateInlining(true); // used to be 'false'
break;
case 'v':
// fall through to case h
No revision
No revision
1.35.6.4 +9 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XSLTC.java
Index: XSLTC.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XSLTC.java,v
retrieving revision 1.35.6.3
retrieving revision 1.35.6.4
diff -u -r1.35.6.3 -r1.35.6.4
--- XSLTC.java 12 Sep 2002 16:07:33 -0000 1.35.6.3
+++ XSLTC.java 18 Sep 2002 15:56:48 -0000 1.35.6.4
@@ -144,7 +144,14 @@
private Vector _classes;
private boolean _callsNodeset = false;
private boolean _multiDocument = false;
- private boolean _templateInlining = true;
+
+ /**
+ * Set to true if template inlining is requested. Template
+ * inlining used to be the default, but we have found that
+ * Hotspots does a better job with shorter methods, so the
+ * default is *not* to inline now.
+ */
+ private boolean _templateInlining = false;
/**
* XSLTC compiler constructor
No revision
No revision
1.5.10.2 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java
Index: ErrorMessages.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java,v
retrieving revision 1.5.10.1
retrieving revision 1.5.10.2
diff -u -r1.5.10.1 -r1.5.10.2
--- ErrorMessages.java 29 Jul 2002 00:01:26 -0000 1.5.10.1
+++ ErrorMessages.java 18 Sep 2002 15:56:48 -0000 1.5.10.2
@@ -234,8 +234,8 @@
" name specified as <jarfile>\n"+
" -p <package> specifies a package name prefix for all generated\n"+
" translet classes.\n" +
- " -n disables template inlining to reduce method\n" +
- " length.\n"+
+ " -n enables template inlining (default behavior
better\n"+
+ " on average).\n" +
" -x turns on additional debugging message output\n" +
" -s disables calling System.exit\n" +
" -u interprets <stylesheet> arguments as URLs\n" +
No revision
No revision
1.34.2.3 +7 -7
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java
Index: TransformerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java,v
retrieving revision 1.34.2.2
retrieving revision 1.34.2.3
diff -u -r1.34.2.2 -r1.34.2.3
--- TransformerFactoryImpl.java 13 Aug 2002 21:21:14 -0000 1.34.2.2
+++ TransformerFactoryImpl.java 18 Sep 2002 15:56:48 -0000 1.34.2.3
@@ -147,9 +147,9 @@
private boolean _debug = false;
/**
- * Set to <code>true</code> when templates are not inlined.
+ * Set to <code>true</code> when templates are inlined.
*/
- private boolean _disableInlining = false;
+ private boolean _enableInlining = false;
/**
* Number of indent spaces when indentation is turned on.
@@ -246,13 +246,13 @@
return;
}
}
- else if (name.equals("disable-inlining")) {
+ else if (name.equals("enable-inlining")) {
if (value instanceof Boolean) {
- _disableInlining = ((Boolean) value).booleanValue();
+ _enableInlining = ((Boolean) value).booleanValue();
return;
}
else if (value instanceof String) {
- _disableInlining = ((String) value).equalsIgnoreCase("true");
+ _enableInlining = ((String) value).equalsIgnoreCase("true");
return;
}
}
@@ -455,7 +455,7 @@
// Create and initialize a stylesheet compiler
final XSLTC xsltc = new XSLTC();
if (_debug) xsltc.setDebug(true);
- if (_disableInlining) xsltc.setTemplateInlining(false);
+ if (_enableInlining) xsltc.setTemplateInlining(true);
xsltc.init();
// Set a document loader (for xsl:include/import) if defined
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
