JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better solution for the last test in constant switch folding

Browse Source
This commit is contained in:
Mihai Bazon
2012-11-14 12:21:43 +02:00
parent dba8da4800
commit bdfcbf496b
2 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/compress.js
View File

@@ -1368,7 +1368,8 @@ merge(Compressor.prototype, {
self.expression = exp[0]; self.expression = exp[0];
if (!compressor.option("dead_code")) break out; if (!compressor.option("dead_code")) break out;
var value = exp[1]; var value = exp[1];
var in_substat = false; var in_if = false;
var in_block = false;
var started = false; var started = false;
var stopped = false; var stopped = false;
var ruined = false; var ruined = false;
@@ -1377,8 +1378,7 @@ merge(Compressor.prototype, {
// no need to descend these node types // no need to descend these node types
return node; return node;
} }
else if (node instanceof AST_Switch) { else if (node instanceof AST_Switch && node === self) {
if (node === self) {
node = node.clone(); node = node.clone();
descend(node, this); descend(node, this);
return ruined ? node : make_node(AST_BlockStatement, node, { return ruined ? node : make_node(AST_BlockStatement, node, {
@@ -1387,22 +1387,27 @@ merge(Compressor.prototype, {
}, []) }, [])
}).transform(compressor); }).transform(compressor);
} }
} else if (node instanceof AST_If || node instanceof AST_Try) {
else if (node instanceof AST_StatementWithBody || node instanceof AST_Switch || node instanceof AST_Try) { var save = in_if;
var save_substat = in_substat; in_if = !in_block;
in_substat = true;
descend(node, this); descend(node, this);
in_substat = save_substat; in_if = save;
return node;
}
else if (node instanceof AST_StatementWithBody || node instanceof AST_Switch) {
var save = in_block;
in_block = true;
descend(node, this);
in_block = save;
return node; return node;
} }
else if (node instanceof AST_Break && this.loopcontrol_target(node.label) === self) { else if (node instanceof AST_Break && this.loopcontrol_target(node.label) === self) {
if (in_substat) { if (in_if) {
// won't handle situations like if (foo) break;
ruined = true; ruined = true;
return node; return node;
} else {
stopped = true;
} }
if (in_block) return node;
stopped = true;
return in_list ? MAP.skip : make_node(AST_EmptyStatement, node); return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
} }
else if (node instanceof AST_SwitchBranch && this.parent() === self) { else if (node instanceof AST_SwitchBranch && this.parent() === self) {

28
test/compress/switch.js
View File

@@ -176,11 +176,35 @@ constant_switch_8: {
} }
} }
expect: { expect: {
OUT: switch (1) { OUT: {
case 1:
x(); x();
for (;;) break OUT; for (;;) break OUT;
y(); y();
} }
} }
} }
constant_switch_9: {
options = { dead_code: true, evaluate: true };
input: {
OUT: switch (1) {
case 1:
x();
for (;;) if (foo) break OUT;
y();
case 1+1:
bar();
default:
def();
}
}
expect: {
OUT: {
x();
for (;;) if (foo) break OUT;
y();
bar();
def();
}
}
}