Merge c19eed46dd into eb55d8a9bb

test/compress/drop-console.js

@@ -10,7 +10,7 @@ drop_console_1: {
     }
 }
 
-drop_console_1: {
+drop_console_2: {
     options = { drop_console: true };
     input: {
         console.log('foo');

test/compress/hoist_vars.js

@@ -0,0 +1,90 @@
+statements: {
+    options = {
+        hoist_funs: false,
+        hoist_vars: true,
+    }
+    input: {
+        function f() {
+            var a = 1;
+            var b = 2;
+            var c = 3;
+            function g() {}
+            return g(a, b, c);
+        }
+    }
+    expect: {
+        function f() {
+            var a = 1, b = 2, c = 3;
+            function g() {}
+            return g(a, b, c);
+        }
+    }
+}
+
+statements_funs: {
+    options = {
+        hoist_funs: true,
+        hoist_vars: true,
+    }
+    input: {
+        function f() {
+            var a = 1;
+            var b = 2;
+            var c = 3;
+            function g() {}
+            return g(a, b, c);
+        }
+    }
+    expect: {
+        function f() {
+            function g() {}
+            var a = 1, b = 2, c = 3;
+            return g(a, b, c);
+        }
+    }
+}
+
+sequences: {
+    options = {
+        hoist_funs: false,
+        hoist_vars: true,
+    }
+    input: {
+        function f() {
+            var a = 1, b = 2;
+            function g() {}
+            var c = 3;
+            return g(a, b, c);
+        }
+    }
+    expect: {
+        function f() {
+            var c, a = 1, b = 2;
+            function g() {}
+            c = 3;
+            return g(a, b, c);
+        }
+    }
+}
+
+sequences_funs: {
+    options = {
+        hoist_funs: true,
+        hoist_vars: true,
+    }
+    input: {
+        function f() {
+            var a = 1, b = 2;
+            function g() {}
+            var c = 3;
+            return g(a, b, c);
+        }
+    }
+    expect: {
+        function f() {
+            function g() {}
+            var a = 1, b = 2, c = 3;
+            return g(a, b, c);
+        }
+    }
+}

test/compress/negate-iife.js

@@ -34,7 +34,7 @@ negate_iife_3: {
     }
 }
 
-negate_iife_3: {
+negate_iife_4: {
     options = {
         negate_iife: true,
         sequences: true
@@ -52,7 +52,7 @@ negate_iife_3: {
     }
 }
 
-negate_iife_4: {
+negate_iife_5: {
     options = {
         negate_iife: true,
         sequences: true,

test/run-tests.js

@@ -194,6 +194,9 @@ function parse_test(file) {
         if (node instanceof U.AST_LabeledStatement
             && tw.parent() instanceof U.AST_Toplevel) {
             var name = node.label.name;
+            if (name in tests) {
+                throw new Error('Duplicated test name "' + name + '" in ' + file);
+            }
             tests[name] = get_one_test(name, node.body);
             return true;
         }