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

Compress conditions that have side effects using sequences

Browse Source
This commit is contained in:
Tal Ater
2014-09-04 02:57:49 +03:00
parent 7971ed33d1
commit fb0ec720a4
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/compress.js
View File

@@ -2322,11 +2322,15 @@ merge(Compressor.prototype, {
});
}
// x=y?1:1 --> x=1
if (!self.condition.has_side_effects(compressor)
&& consequent instanceof AST_Constant
if (consequent instanceof AST_Constant
&& alternative instanceof AST_Constant
&& consequent.equivalent_to(alternative)) {
return make_node_from_constant(compressor, consequent.value, self);
if (self.condition.has_side_effects(compressor)) {
return AST_Seq.from_array([self.condition, make_node_from_constant(compressor, consequent.value, self)]);
} else {
return make_node_from_constant(compressor, consequent.value, self);
}
}
return self;
});

32
test/compress/conditionals.js
View File

@@ -258,30 +258,38 @@ cond_7: {
x = y ? 'foo' : y ? 'foo' : 'fo'+'o';
// Compress conditions that have side effects
if (condition()) {
x = 10+10;
} else {
x = 20;
}
if (z) {
x = 'fuji';
} else if (condition()) {
x = 'fu'+'ji';
} else {
x = 'fuji';
}
x = condition() ? 'foobar' : 'foo'+'bar';
// don't compress these
x = y ? a : b;
x = y ? 'foo' : 'fo';
// make sure not to mess with conditions that have side effects
// TODO: Make sure to mess with conditions that have side effects... proprely
if (some_condition()) {
x = 1+1;
} else {
x = 2;
}
x = some_condition() ? 'foo' : 'fo'+'o';
}
expect: {
x = 2;
x = 2;
x = 'foo';
x = 'foo';
x = (condition(), 20);
x = z ? 'fuji' : (condition(), 'fuji');
x = (condition(), 'foobar');
x = y ? a : b;
x = y ? 'foo' : 'fo';
x = some_condition() ? 2 : 2;
x = some_condition() ? 'foo' : 'foo';
}
}