minor

devinus · Aug 27, 2012 · 8dfa9fe · 8dfa9fe
1 parent 4437e7a
commit 8dfa9fe
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/test/compress/blocks.js b/test/compress/blocks.js
@@ -20,7 +20,7 @@ keep_some_blocks: {
         // 1.
         if (foo) {
             {{{}}}
-            if (bar) baz();
+            if (bar) { baz(); }
             {{}}
         } else {
             stuff();

diff --git a/test/compress/dead-code.js b/test/compress/dead-code.js
@@ -33,11 +33,17 @@ dead_code_2_should_warn: {
             x = 10;
             throw "foo";
             // completely discarding the `if` would introduce some
-            // bugs.  UglifyJS v1 doesn't deal with this issue.
+            // bugs.  UglifyJS v1 doesn't deal with this issue; in v2
+            // we copy any declarations to the upper scope.
             if (x) {
                 y();
                 var x;
                 function g(){};
+                // but nested declarations should not be kept.
+                (function(){
+                    var q;
+                    function y(){};
+                })();
             }
         }
     }

diff --git a/test/run-tests.js b/test/run-tests.js
@@ -22,11 +22,11 @@ function log() {
 }
 
 function log_directory(dir) {
-    log("--- Entering [{dir}]", { dir: dir });
+    log("*** Entering [{dir}]", { dir: dir });
 }
 
 function log_start_file(file) {
-    log("*** {file}", { file: file });
+    log("--- {file}", { file: file });
 }
 
 function log_test(name) {

diff --git a/tmp/test-node.js b/tmp/test-node.js
@@ -11,27 +11,28 @@ var code = fs.readFileSync(filename, "utf8");
 var ast = time_it("parse", function() {
     return UglifyJS.parse(code);
 });
-var stream = UglifyJS.OutputStream({ beautify: true });
+var stream = UglifyJS.OutputStream({ beautify: false });
 time_it("scope", function(){
     ast.figure_out_scope();
 });
-time_it("mangle", function(){
-    ast.mangle_names();
-});
+// time_it("mangle", function(){
+//     ast.mangle_names();
+// });
 
-ast.scope_warnings();
+//ast.scope_warnings();
 
 time_it("compress", function(){
     var compressor = new UglifyJS.Compressor({
     });
     ast = ast.squeeze(compressor);
 });
+
 time_it("generate", function(){
     ast.print(stream);
 });
 sys.puts(stream.get());
 
-ast.scope_warnings();
+//ast.scope_warnings();
 
 function time_it(name, cont) {
     var t1 = new Date().getTime();