head 1.3; access; symbols; locks; strict; comment @# @; 1.3 date 2008.10.22.06.53.28; author rse; state Exp; branches; next 1.2; commitid 25fgKsXEFwLsGAnt; 1.2 date 2008.08.02.09.51.55; author rse; state Exp; branches; next 1.1; commitid 7suyze0nhAd8hcdt; 1.1 date 2008.08.02.08.52.04; author rse; state Exp; branches; next ; commitid raoj6pptZ3DAWbdt; desc @@ 1.3 log @upgrading package: yuicompressor 2.3.6 -> 2.4 @ text @Index: src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java --- src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java.orig 2008-10-21 17:09:08 +0200 +++ src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java 2008-10-22 08:50:32 +0200 @@@@ -901,10 +901,6 @@@@ case Token.VAR: - if (mode == BUILDING_SYMBOL_TREE && scope.incrementVarCount() > 1) { - warn("Try to use a single 'var' statement per scope.", true); - } - /* FALLSTHROUGH */ case Token.CONST: Index: src/com/yahoo/platform/yui/compressor/YUICompressor.java --- src/com/yahoo/platform/yui/compressor/YUICompressor.java.orig 2008-10-21 17:09:08 +0200 +++ src/com/yahoo/platform/yui/compressor/YUICompressor.java 2008-10-22 08:50:32 +0200 @@@@ -52,7 +52,7 @@@@ charset = "UTF-8"; } if (verbose) { - System.err.println("\n[INFO] Using charset " + charset); + System.err.println("[INFO] Using charset " + charset); } } @@@@ -114,18 +114,18 @@@@ public void warning(String message, String sourceName, int line, String lineSource, int lineOffset) { if (line < 0) { - System.err.println("\n[WARNING] " + message); + System.err.println("[WARNING] " + message); } else { - System.err.println("\n[WARNING] " + line + ':' + lineOffset + ':' + message); + System.err.println("[WARNING] " + line + ':' + lineOffset + ':' + message); } } public void error(String message, String sourceName, int line, String lineSource, int lineOffset) { if (line < 0) { - System.err.println("\n[ERROR] " + message); + System.err.println("[ERROR] " + message); } else { - System.err.println("\n[ERROR] " + line + ':' + lineOffset + ':' + message); + System.err.println("[ERROR] " + line + ':' + lineOffset + ':' + message); } } @ 1.2 log @simplify compilation and avoid 'var' messages at all @ text @d2 2 a3 2 --- src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java.orig 2008-07-10 14:38:00 +0200 +++ src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java 2008-08-02 11:48:31 +0200 d16 3 a18 12 --- src/com/yahoo/platform/yui/compressor/YUICompressor.java.orig 2008-07-10 14:38:00 +0200 +++ src/com/yahoo/platform/yui/compressor/YUICompressor.java 2008-08-02 11:48:07 +0200 @@@@ -49,7 +49,7 @@@@ if (verbose) { String jvmVendor = System.getProperty("java.vendor"); if (!jvmVendor.equalsIgnoreCase("Sun Microsystems Inc.")) { - System.err.println("\n[INFO] It is recommended to use Sun Microsystems' JVM [java.vendor = " + jvmVendor + "]"); + System.err.println("[INFO] It is recommended to use Sun Microsystems' JVM [java.vendor = " + jvmVendor + "]"); } } @@@@ -60,7 +60,7 @@@@ d27 1 a27 1 @@@@ -122,18 +122,18 @@@@ @ 1.1 log @patch the output @ text @d3 3 a5 2 +++ src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java 2008-08-02 10:04:52 +0200 @@@@ -902,7 +902,7 @@@@ d8 1 a8 1 if (mode == BUILDING_SYMBOL_TREE && scope.incrementVarCount() > 1) { d10 3 a12 2 + System.err.println("[INFO] Try to use a single 'var' statement per scope."); } d14 1 a14 1 /* FALLSTHROUGH */ d17 1 a17 1 +++ src/com/yahoo/platform/yui/compressor/YUICompressor.java 2008-08-02 10:04:22 +0200 @