aboutsummaryrefslogtreecommitdiff
path: root/lib/compress.js
diff options
context:
space:
mode:
authorAlex Lam S.L <alexlamsl@gmail.com>2017-04-02 16:14:09 +0800
committerGitHub <noreply@github.com>2017-04-02 16:14:09 +0800
commitd57527697fba37bfad50ca0283326a458cdea031 (patch)
tree37dfea84a5647a446265b524ec4f498341d043df /lib/compress.js
parentf7ca4f229795f87674d32e2df3de3cf1f8367a39 (diff)
downloadtracifyjs-d57527697fba37bfad50ca0283326a458cdea031.tar.gz
tracifyjs-d57527697fba37bfad50ca0283326a458cdea031.zip
avoid confusion of `NaN` & `Infinity` with `catch` symbol of the same name (#1763)
fixes #1760 fixes #1761
Diffstat (limited to 'lib/compress.js')
-rw-r--r--lib/compress.js22
1 files changed, 16 insertions, 6 deletions
diff --git a/lib/compress.js b/lib/compress.js
index 5776fb88..763490a7 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -409,6 +409,18 @@ merge(Compressor.prototype, {
}
});
+ function find_variable(compressor, name) {
+ var scope, i = 0;
+ while (scope = compressor.parent(i++)) {
+ if (scope instanceof AST_Scope) break;
+ if (scope instanceof AST_Catch) {
+ scope = scope.argname.definition().scope;
+ break;
+ }
+ }
+ return scope.find_variable(name);
+ }
+
function make_node(ctor, orig, props) {
if (!props) props = {};
if (orig) {
@@ -3517,12 +3529,11 @@ merge(Compressor.prototype, {
OPT(AST_Undefined, function(self, compressor){
if (compressor.option("unsafe")) {
- var scope = compressor.find_parent(AST_Scope);
- var undef = scope.find_variable("undefined");
+ var undef = find_variable(compressor, "undefined");
if (undef) {
var ref = make_node(AST_SymbolRef, self, {
name : "undefined",
- scope : scope,
+ scope : undef.scope,
thedef : undef
});
ref.is_undefined = true;
@@ -3538,8 +3549,7 @@ merge(Compressor.prototype, {
});
OPT(AST_Infinity, function(self, compressor){
- var retain = compressor.option("keep_infinity")
- && !compressor.find_parent(AST_Scope).find_variable("Infinity");
+ var retain = compressor.option("keep_infinity") && !find_variable(compressor, "Infinity");
return retain ? self : make_node(AST_Binary, self, {
operator: "/",
left: make_node(AST_Number, self, {
@@ -3552,7 +3562,7 @@ merge(Compressor.prototype, {
});
OPT(AST_NaN, function(self, compressor){
- return compressor.find_parent(AST_Scope).find_variable("NaN") ? make_node(AST_Binary, self, {
+ return find_variable(compressor, "NaN") ? make_node(AST_Binary, self, {
operator: "/",
left: make_node(AST_Number, self, {
value: 0