Skip to content

Commit

Permalink
Merge pull request #1971 from alexlamsl/v2.8.27
Browse files Browse the repository at this point in the history
  • Loading branch information
alexlamsl committed May 19, 2017
2 parents 4cbf5a7 + 957c54b commit a7c987a
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 6 deletions.
1 change: 0 additions & 1 deletion .travis.yml
@@ -1,5 +1,4 @@
language: node_js
before_install: "npm install -g npm"
node_js:
- "0.10"
- "0.12"
Expand Down
11 changes: 7 additions & 4 deletions README.md
Expand Up @@ -353,6 +353,9 @@ to set `true`; it's effectively a shortcut for `foo=true`).
- `unsafe_proto` (default: false) -- optimize expressions like
`Array.prototype.slice.call(a)` into `[].slice.call(a)`

- `unsafe_regexp` (default: false) -- enable substitutions of variables with
`RegExp` values the same way as if they are constants.

- `conditionals` -- apply optimizations for `if`-s and conditional
expressions

Expand Down Expand Up @@ -443,10 +446,10 @@ to set `true`; it's effectively a shortcut for `foo=true`).
- `keep_infinity` -- default `false`. Pass `true` to prevent `Infinity` from
being compressed into `1/0`, which may cause performance issues on Chrome.

- `side_effects` -- default `false`. Pass `true` to potentially drop functions
marked as "pure". A function call is marked as "pure" if a comment annotation
`/*@__PURE__*/` or `/*#__PURE__*/` immediately precedes the call. For example:
`/*@__PURE__*/foo()`;
- `side_effects` -- default `true`. Pass `false` to disable potentially dropping
functions marked as "pure". A function call is marked as "pure" if a comment
annotation `/*@__PURE__*/` or `/*#__PURE__*/` immediately precedes the call. For
example: `/*@__PURE__*/foo();`


### The `unsafe` option
Expand Down
3 changes: 2 additions & 1 deletion lib/compress.js
Expand Up @@ -84,6 +84,7 @@ function Compressor(options, false_by_default) {
unsafe_comps : false,
unsafe_math : false,
unsafe_proto : false,
unsafe_regexp : false,
unused : !false_by_default,
warnings : true,
}, true);
Expand Down Expand Up @@ -3680,7 +3681,7 @@ merge(Compressor.prototype, {
if (fixed) {
if (d.should_replace === undefined) {
var init = fixed.evaluate(compressor);
if (init !== fixed) {
if (init !== fixed && (compressor.option("unsafe_regexp") || !(init instanceof RegExp))) {
init = make_node_from_constant(init, fixed);
var value = init.optimize(compressor).print_to_string().length;
var fn;
Expand Down
47 changes: 47 additions & 0 deletions test/compress/evaluate.js
Expand Up @@ -989,3 +989,50 @@ Infinity_NaN_undefined_LHS: {
"}",
]
}

issue_1964_1: {
options = {
evaluate: true,
reduce_vars: true,
unsafe_regexp: false,
unused: true,
}
input: {
function f() {
var long_variable_name = /\s/;
return "a b c".split(long_variable_name)[1];
}
console.log(f());
}
expect: {
function f() {
var long_variable_name = /\s/;
return "a b c".split(long_variable_name)[1];
}
console.log(f());
}
expect_stdout: "b"
}

issue_1964_2: {
options = {
evaluate: true,
reduce_vars: true,
unsafe_regexp: true,
unused: true,
}
input: {
function f() {
var long_variable_name = /\s/;
return "a b c".split(long_variable_name)[1];
}
console.log(f());
}
expect: {
function f() {
return "a b c".split(/\s/)[1];
}
console.log(f());
}
expect_stdout: "b"
}

0 comments on commit a7c987a

Please sign in to comment.