From 7de541f9c8f2427a7351bb57327978fa087a8c80 Mon Sep 17 00:00:00 2001 From: alexlamsl Date: Sun, 24 Dec 2017 19:21:31 +0800 Subject: [PATCH] fix tests --- test/compress/drop-unused.js | 2 +- test/compress/hoist_props.js | 10 +++++++--- test/compress/issue-1212.js | 4 ++-- test/compress/issue-1466.js | 7 ------- test/compress/sequences.js | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/test/compress/drop-unused.js b/test/compress/drop-unused.js index 92c3eef9..2886d52f 100644 --- a/test/compress/drop-unused.js +++ b/test/compress/drop-unused.js @@ -1269,7 +1269,7 @@ var_catch_toplevel: { reassign_const: { options = { - cascade: true, + collapse_vars: true, sequences: true, side_effects: true, unused: true, diff --git a/test/compress/hoist_props.js b/test/compress/hoist_props.js index b1f7c6ad..f572bd2d 100644 --- a/test/compress/hoist_props.js +++ b/test/compress/hoist_props.js @@ -489,10 +489,14 @@ hoist_function_with_call: { console.log(o.p.name, o.p === o.p, o.p(o.x), o.p(o.y)); } expect: { - var o_p = function Foo(value){ - return 10 * value + var o = { + p: function Foo(value) { + return 10 * value; + }, + x: 1, + y: 2 }; - console.log(o_p.name, true, o_p(1), o_p(2)); + console.log(o.p.name, o.p == o.p, o.p(o.x), o.p(o.y)); } expect_stdout: "Foo true 10 20" } diff --git a/test/compress/issue-1212.js b/test/compress/issue-1212.js index 72d6ffe0..2b45d209 100644 --- a/test/compress/issue-1212.js +++ b/test/compress/issue-1212.js @@ -14,7 +14,7 @@ issue_1212_debug_false: { keep_fargs : true, if_return : true, join_vars : true, - cascade : true, + collapse_vars : true, side_effects : true, } input: { @@ -52,7 +52,7 @@ issue_1212_debug_true: { keep_fargs : true, if_return : true, join_vars : true, - cascade : true, + collapse_vars : true, side_effects : true, } input: { diff --git a/test/compress/issue-1466.js b/test/compress/issue-1466.js index 5827aee8..1eee16b3 100644 --- a/test/compress/issue-1466.js +++ b/test/compress/issue-1466.js @@ -11,7 +11,6 @@ same_variable_in_multiple_for_loop: { keep_fargs: true, if_return: true, join_vars: true, - cascade: true, side_effects: true, collapse_vars: true, } @@ -54,7 +53,6 @@ same_variable_in_multiple_forOf: { keep_fargs: true, if_return: true, join_vars: true, - cascade: true, side_effects: true, collapse_vars: true, } @@ -96,7 +94,6 @@ same_variable_in_multiple_forIn: { keep_fargs: true, if_return: true, join_vars: true, - cascade: true, side_effects: true, collapse_vars: true, } @@ -138,7 +135,6 @@ different_variable_in_multiple_for_loop: { keep_fargs: true, if_return: true, join_vars: true, - cascade: true, side_effects: true, collapse_vars: true, } @@ -181,7 +177,6 @@ different_variable_in_multiple_forOf: { keep_fargs: true, if_return: true, join_vars: true, - cascade: true, side_effects: true, collapse_vars: true, } @@ -223,7 +218,6 @@ different_variable_in_multiple_forIn: { keep_fargs: true, if_return: true, join_vars: true, - cascade: true, side_effects: true, collapse_vars: true, } @@ -265,7 +259,6 @@ more_variable_in_multiple_for: { keep_fargs: true, if_return: true, join_vars: true, - cascade: true, side_effects: true, collapse_vars: true, } diff --git a/test/compress/sequences.js b/test/compress/sequences.js index 53ce1850..835ab7ee 100644 --- a/test/compress/sequences.js +++ b/test/compress/sequences.js @@ -721,7 +721,7 @@ issue_27: { reassign_const: { options = { - cascade: true, + collapse_vars: true, sequences: true, side_effects: true, }