Merge branch 'master' of github.com:mishoo/UglifyJS2

This commit is contained in:
Mihai Bazon
2013-10-27 10:03:01 +02:00
2 changed files with 4 additions and 1 deletions

View File

@@ -2067,7 +2067,8 @@ merge(Compressor.prototype, {
&& self.left.right instanceof AST_Constant
&& self.right instanceof AST_Binary
&& self.right.operator == "+"
&& self.right.left instanceof AST_Constant) {
&& self.right.left instanceof AST_Constant
&& self.right.is_string(compressor)) {
self = make_node(AST_Binary, self, {
operator: "+",
left: make_node(AST_Binary, self.left, {

View File

@@ -10,6 +10,7 @@ concatenate_rhs_strings: {
foo(bar() + 123 + "Hello" + "World" + ("Foo" + "Bar"));
foo("Foo" + "Bar" + bar() + 123 + "Hello" + "World" + ("Foo" + "Bar"));
foo("Hello" + bar() + 123 + "World");
foo(bar() + 'Foo' + (10 + parseInt('10')));
}
expect: {
foo(bar() + 123 + "HelloWorld");
@@ -18,5 +19,6 @@ concatenate_rhs_strings: {
foo(bar() + 123 + "HelloWorldFooBar");
foo("FooBar" + bar() + "123HelloWorldFooBar");
foo("Hello" + bar() + "123World");
foo(bar() + 'Foo' + (10 + parseInt('10')));
}
}