diff --git a/README.md b/README.md index c60a124d..f4d82ace 100644 --- a/README.md +++ b/README.md @@ -256,6 +256,10 @@ to set `true`; it's effectively a shortcut for `foo=true`). - `drop_console` -- default `false`. Pass `true` to discard calls to `console.*` functions. +- `keep_fargs` -- default `false`. Pass `true` to prevent the + compressor from discarding unused function arguments. You need this + for code which relies on `Function.length`. + ### The `unsafe` option It enables some transformations that *might* break code logic in certain diff --git a/lib/compress.js b/lib/compress.js index bf2d166e..5328e05d 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -897,7 +897,9 @@ merge(Compressor.prototype, { || this.operator == "--" || this.expression.has_side_effects(compressor); }); - def(AST_SymbolRef, function(compressor){ return false }); + def(AST_SymbolRef, function(compressor){ + return this.global() && this.undeclared(); + }); def(AST_Object, function(compressor){ for (var i = this.properties.length; --i >= 0;) if (this.properties[i].has_side_effects(compressor)) diff --git a/test/compress/conditionals.js b/test/compress/conditionals.js index d9c75f18..2b927250 100644 --- a/test/compress/conditionals.js +++ b/test/compress/conditionals.js @@ -239,6 +239,7 @@ cond_7: { evaluate : true }; input: { + var x, y, z, a, b; // compress these if (y) { x = 1+1; @@ -281,6 +282,7 @@ cond_7: { x = y ? 'foo' : 'fo'; } expect: { + var x, y, z, a, b; x = 2; x = 2; x = 'foo'; @@ -293,6 +295,24 @@ cond_7: { } } +cond_7_1: { + options = { + conditionals: true, + evaluate : true + }; + input: { + // access to global should be assumed to have side effects + if (y) { + x = 1+1; + } else { + x = 2; + } + } + expect: { + x = (y, 2); + } +} + cond_8: { options = { conditionals: true, diff --git a/test/compress/sequences.js b/test/compress/sequences.js index 46695714..0e3319ab 100644 --- a/test/compress/sequences.js +++ b/test/compress/sequences.js @@ -91,9 +91,11 @@ make_sequences_4: { lift_sequences_1: { options = { sequences: true }; input: { + var foo, x, y, bar; foo = !(x(), y(), bar()); } expect: { + var foo, x, y, bar; x(), y(), foo = !bar(); } } @@ -101,10 +103,12 @@ lift_sequences_1: { lift_sequences_2: { options = { sequences: true, evaluate: true }; input: { + var foo, bar; foo.x = (foo = {}, 10); bar = (bar = {}, 10); } expect: { + var foo, bar; foo.x = (foo = {}, 10), bar = {}, bar = 10; } @@ -113,9 +117,11 @@ lift_sequences_2: { lift_sequences_3: { options = { sequences: true, conditionals: true }; input: { + var x, foo, bar, baz; x = (foo(), bar(), baz()) ? 10 : 20; } expect: { + var x, foo, bar, baz; foo(), bar(), x = baz() ? 10 : 20; } } @@ -123,9 +129,11 @@ lift_sequences_3: { lift_sequences_4: { options = { side_effects: true }; input: { + var x, foo, bar, baz; x = (foo, bar, baz); } expect: { + var x, foo, bar, baz; x = baz; } }