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

More attempts to determine when addition is associative

Browse Source 
Somebody hit me with bug reports on this. :)

Refs #300
This commit is contained in:
Mihai Bazon
2013-09-22 15:26:10 +03:00
parent 037199bfe2
commit afdaeba37d
3 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/compress.js
View File

@@ -1965,7 +1965,7 @@ merge(Compressor.prototype, {
self = make_node(AST_Binary, self, { self = make_node(AST_Binary, self, {
operator: "+", operator: "+",
left: make_node(AST_String, null, { left: make_node(AST_String, null, {
value: self.left.getValue() + self.right.left.getValue(), value: "" + self.left.getValue() + self.right.left.getValue(),
start: self.left.start, start: self.left.start,
end: self.right.left.end end: self.right.left.end
}), }),
@@ -1981,12 +1981,33 @@ merge(Compressor.prototype, {
operator: "+", operator: "+",
left: self.left.left, left: self.left.left,
right: make_node(AST_String, null, { right: make_node(AST_String, null, {
value: self.left.right.getValue() + self.right.getValue(), value: "" + self.left.right.getValue() + self.right.getValue(),
start: self.left.right.start, start: self.left.right.start,
end: self.right.end end: self.right.end
}) })
}); });
} }
if (self.left instanceof AST_Binary
&& self.left.operator == "+"
&& self.left.is_string(compressor)
&& self.left.right instanceof AST_Constant
&& self.right instanceof AST_Binary
&& self.right.operator == "+"
&& self.right.left instanceof AST_Constant) {
self = make_node(AST_Binary, self, {
operator: "+",
left: make_node(AST_Binary, self.left, {
operator: "+",
left: self.left.left,
right: make_node(AST_String, null, {
value: "" + self.left.right.getValue() + self.right.left.getValue(),
start: self.left.right.start,
end: self.right.left.end
})
}),
right: self.right.right
});
}
} }
} }
return self.evaluate(compressor)[0]; return self.evaluate(compressor)[0];

2
test/compress/arrays.js
View File

@@ -69,6 +69,6 @@ constant_join_2: {
var e = [ "foo", "bar", boo(), var e = [ "foo", "bar", boo(),
"foo+1+2+3+bar", "foo+1+2+3+bar",
"baz", "x", "y" ].join("really-long-separator"); "baz", "x", "y" ].join("really-long-separator");
var f = "strstr" + variable + "foobar" + ("moo" + foo); var f = "strstr" + variable + "foobarmoo" + foo;
} }
} }

22
test/compress/concat-strings.js Normal file
View File

@@ -0,0 +1,22 @@
concat_1: {
options = {
evaluate: true
};
input: {
var a = "foo" + "bar" + x() + "moo" + "foo" + y() + "x" + "y" + "z" + q();
var b = "foo" + 1 + x() + 2 + "boo";
var c = 1 + x() + 2 + "boo";
// this CAN'T safely be shortened to 1 + x() + "5boo"
var d = 1 + x() + 2 + 3 + "boo";
var e = 1 + x() + 2 + "X" + 3 + "boo";
}
expect: {
var a = "foobar" + x() + "moofoo" + y() + "xyz" + q();
var b = "foo1" + x() + "2boo";
var c = 1 + x() + 2 + "boo";
var d = 1 + x() + 2 + 3 + "boo";
var e = 1 + x() + 2 + "X3boo";
}
}