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

Merge 1588538bc1 into 78e98d2611

Browse Source
This commit is contained in:
Dan 2013-09-21 14:22:39 -07:00
commit d42a1bb824
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/compress.js
View File

@ -655,6 +655,8 @@ merge(Compressor.prototype, {
throw def; throw def;
}); });
function ev(node, compressor) { function ev(node, compressor) {
if (!compressor) throw new Error("Compressor must be passed");
return node._eval(compressor); return node._eval(compressor);
}; };
def(AST_Node, function(){ def(AST_Node, function(){
@ -700,9 +702,6 @@ merge(Compressor.prototype, {
case "+" : case "+" :
// handle concatenating strings even if the left part cannot // handle concatenating strings even if the left part cannot
// be evaluated, e.g. (variable + "str") + "str" // be evaluated, e.g. (variable + "str") + "str"
if (!(c instanceof Compressor)) {
throw new Error("Compressor must be passed!!");
}
if (left instanceof AST_Binary && left.operator == "+" && left.is_string(c)) { if (left instanceof AST_Binary && left.operator == "+" && left.is_string(c)) {
return make_node(AST_Binary, this, { return make_node(AST_Binary, this, {
operator: "+", operator: "+",
@ -751,10 +750,33 @@ merge(Compressor.prototype, {
if (this.expression instanceof AST_Dot if (this.expression instanceof AST_Dot
&& this.expression.expression instanceof AST_Array && this.expression.expression instanceof AST_Array
&& this.expression.property == "join") { && this.expression.property == "join") {
var join_arg = this.args[0] ? "" + ev(this.args[0], compressor) : ",";
try {
var x = this.expression.expression.elements.map(function(el){ var x = this.expression.expression.elements.map(function(el){
return ev(el, compressor); return ev(el, compressor);
}); });
return x.join(ev(this.args[0])); return x.join(join_arg);
} catch (ex) {
if (ex !== def) throw ex;
join_arg = make_node_from_constant(compressor, join_arg, this.args[0]);
var x = this.expression.expression.elements.reduce(function(el1, el2){
return make_node(AST_Binary, null, {
operator : "+",
left : make_node(AST_Binary, null, {
operator : "+",
left : el1,
right : join_arg,
start : el1.start,
end : join_arg.end
}),
right : el2,
start : el1.start,
end : el2.end
});
});
return x.transform(compressor);
}
} }
} }
throw def; throw def;

12
test/compress/arrays.js
View File

@ -19,15 +19,21 @@ constant_join: {
evaluate : true evaluate : true
}; };
input: { input: {
var a = [ "foo", "bar", "baz" ].join(""); var a = [ "foo", "bar", "baz" ].join();
var b = [ "foo", 1, 2, 3, "bar" ].join(""); var b = [ "foo", 1, 2, 3, "bar" ].join("");
var c = [ boo(), "foo", 1, 2, 3, "bar", bar() ].join(""); var c = [ boo(), "foo", 1, 2, 3, "bar", bar() ].join("");
var d = [ "foo", 1 + 2 + "bar", "baz" ].join("-"); var d = [ "foo", 1 + 2 + "bar", "baz" ].join("-");
var e = [ boo ].join(foo + bar);
var f = [ boo ].join("");
var g = [ "foo", "boo" + bar, "baz"].join("-");
} }
expect: { expect: {
var a = "foobarbaz"; var a = "foo,bar,baz";
var b = "foo123bar"; var b = "foo123bar";
var c = [ boo(), "foo", 1, 2, 3, "bar", bar() ].join(""); // we could still shorten this one, but oh well. var c = boo() + "foo123bar" + bar();
var d = "foo-3bar-baz"; var d = "foo-3bar-baz";
var e = [ boo ].join(foo + bar);
var f = [ boo ].join();
var g = "foo-" + ("boo" + bar) + "-baz"; // we could still shorten this one, but oh well.
} }
} }