santiagopg 2002/09/17 15:01:25
Modified: java/src/org/apache/xalan/xsltc/cmdline Compile.java
java/src/org/apache/xalan/xsltc/compiler XSLTC.java
java/src/org/apache/xalan/xsltc/compiler/util
ErrorMessages.java
Log:
Change default policy for template inlining.
Revision Changes Path
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Compile.java 26 Aug 2002 16:03:00 -0000 1.12
+++ Compile.java 17 Sep 2002 22:01:25 -0000 1.13
@@ -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
1.44 +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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- XSLTC.java 26 Aug 2002 16:03:00 -0000 1.43
+++ XSLTC.java 17 Sep 2002 22:01:25 -0000 1.44
@@ -142,7 +142,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
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ErrorMessages.java 25 Jul 2002 11:44:19 -0000 1.12
+++ ErrorMessages.java 17 Sep 2002 22:01:25 -0000 1.13
@@ -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" +
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
