// the func (becomes lexical instead of global).
function maintain_this_binding(parent, orig, val) {
if (parent instanceof AST_UnaryPrefix && parent.operator == "delete"
- || parent instanceof AST_Call && parent.expression === orig
+ || parent.TYPE == "Call" && parent.expression === orig
&& (val instanceof AST_PropAccess || val instanceof AST_SymbolRef && val.name == "eval")) {
return make_sequence(orig, [ make_node(AST_Number, orig, { value: 0 }), val ]);
}
return self;
});
- OPT(AST_Call, function(self, compressor){
+ AST_Call.DEFMETHOD("lift_sequences", function(compressor) {
+ if (!compressor.option("sequences")) return this;
+ var exp = this.expression;
+ if (!(exp instanceof AST_Sequence)) return this;
+ var tail = exp.tail_node();
+ if (tail instanceof AST_PropAccess && !(this instanceof AST_New)) return this;
+ var expressions = exp.expressions.slice(0, -1);
+ var node = this.clone();
+ node.expression = tail;
+ expressions.push(node);
+ return make_sequence(this, expressions).optimize(compressor);
+ });
+
+ OPT(AST_Call, function(self, compressor) {
+ var seq = self.lift_sequences(compressor);
+ if (seq !== self) {
+ return seq;
+ }
var exp = self.expression;
var fn = exp;
if (compressor.option("reduce_vars") && fn instanceof AST_SymbolRef) {
}
});
- OPT(AST_New, function(self, compressor){
+ OPT(AST_New, function(self, compressor) {
+ var seq = self.lift_sequences(compressor);
+ if (seq !== self) {
+ return seq;
+ }
if (compressor.option("unsafe")) {
var exp = self.expression;
if (is_undeclared_ref(exp)) {
});
AST_Unary.DEFMETHOD("lift_sequences", function(compressor){
- if (compressor.option("sequences")) {
- if (this.expression instanceof AST_Sequence) {
- var x = this.expression.expressions.slice();
- var e = this.clone();
- e.expression = x.pop();
- x.push(e);
- return make_sequence(this, x).optimize(compressor);
- }
+ if (compressor.option("sequences") && this.expression instanceof AST_Sequence) {
+ var x = this.expression.expressions.slice();
+ var e = this.clone();
+ e.expression = x.pop();
+ x.push(e);
+ return make_sequence(this, x).optimize(compressor);
}
return this;
});