diff options
| author | Mihai Bazon <mihai@bazon.net> | 2013-10-27 10:03:01 +0200 |
|---|---|---|
| committer | Mihai Bazon <mihai@bazon.net> | 2013-10-27 10:03:01 +0200 |
| commit | b47f7b76b9f0ff5e34d744439f327897a592f675 (patch) | |
| tree | 4c416fa98867b10f2f06442134c16537ee60a10f | |
| parent | 582cc55cffc198f3401f90a0b32e2fcbe89afee1 (diff) | |
| parent | 8979579e55025a72caf580788b48831cd7d623de (diff) | |
| download | tracifyjs-b47f7b76b9f0ff5e34d744439f327897a592f675.tar.gz tracifyjs-b47f7b76b9f0ff5e34d744439f327897a592f675.zip | |
Merge branch 'master' of github.com:mishoo/UglifyJS2
| -rw-r--r-- | lib/compress.js | 3 | ||||
| -rw-r--r-- | test/compress/issue-126.js | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/compress.js b/lib/compress.js index 121e312a..13ae7c70 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -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, { diff --git a/test/compress/issue-126.js b/test/compress/issue-126.js index 1e654941..7a597b87 100644 --- a/test/compress/issue-126.js +++ b/test/compress/issue-126.js @@ -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'))); } } |