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

refactor Compressor.toplevel (#2149)

Browse Source
This commit is contained in:
Alex Lam S.L
2017-06-23 13:11:40 +08:00
committed by GitHub
parent b3a57ff019
commit d58b184835
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/compress.js
View File

@@ -124,13 +124,13 @@ function Compressor(options, false_by_default) {
}; };
} }
var toplevel = this.options["toplevel"]; var toplevel = this.options["toplevel"];
if (typeof toplevel == "string") { this.toplevel = typeof toplevel == "string" ? {
this.toplevel.funcs = /funcs/.test(toplevel); funcs: /funcs/.test(toplevel),
this.toplevel.vars = /vars/.test(toplevel); vars: /vars/.test(toplevel)
} else { } : {
this.toplevel = toplevel ? return_true : return_false; funcs: toplevel,
this.toplevel.funcs = this.toplevel.vars = toplevel; vars: toplevel
} };
var sequences = this.options["sequences"]; var sequences = this.options["sequences"];
this.sequences_limit = sequences == 1 ? 800 : sequences | 0; this.sequences_limit = sequences == 1 ? 800 : sequences | 0;
this.warnings_produced = {}; this.warnings_produced = {};
@@ -139,11 +139,11 @@ function Compressor(options, false_by_default) {
Compressor.prototype = new TreeTransformer; Compressor.prototype = new TreeTransformer;
merge(Compressor.prototype, { merge(Compressor.prototype, {
option: function(key) { return this.options[key] }, option: function(key) { return this.options[key] },
toplevel: function(def) { exposed: function(def) {
for (var i = 0, len = def.orig.length; i < len; i++) if (def.global) for (var i = 0, len = def.orig.length; i < len; i++)
if (!this.toplevel[def.orig[i] instanceof AST_SymbolDefun ? "funcs" : "vars"]) if (!this.toplevel[def.orig[i] instanceof AST_SymbolDefun ? "funcs" : "vars"])
return false;
return true; return true;
return false;
}, },
compress: function(node) { compress: function(node) {
if (this.option("expression")) { if (this.option("expression")) {
@@ -345,7 +345,7 @@ merge(Compressor.prototype, {
} }
if (node instanceof AST_Defun) { if (node instanceof AST_Defun) {
var d = node.name.definition(); var d = node.name.definition();
if (d.global && !compressor.toplevel(d) || safe_to_read(d)) { if (compressor.exposed(d) || safe_to_read(d)) {
d.fixed = false; d.fixed = false;
} else { } else {
d.fixed = node; d.fixed = node;
@@ -517,7 +517,7 @@ merge(Compressor.prototype, {
def.escaped = false; def.escaped = false;
if (def.scope.uses_eval) { if (def.scope.uses_eval) {
def.fixed = false; def.fixed = false;
} else if (!def.global || compressor.toplevel(def)) { } else if (!compressor.exposed(def)) {
def.fixed = undefined; def.fixed = undefined;
} else { } else {
def.fixed = false; def.fixed = false;
@@ -748,7 +748,7 @@ merge(Compressor.prototype, {
} }
if (candidate instanceof AST_VarDef) { if (candidate instanceof AST_VarDef) {
var def = candidate.name.definition(); var def = candidate.name.definition();
if (def.references.length == 1 && (!def.global || compressor.toplevel(def))) { if (def.references.length == 1 && !compressor.exposed(def)) {
return maintain_this_binding(parent, node, candidate.value); return maintain_this_binding(parent, node, candidate.value);
} }
return make_node(AST_Assign, candidate, { return make_node(AST_Assign, candidate, {
@@ -810,7 +810,7 @@ merge(Compressor.prototype, {
if (expr instanceof AST_VarDef) { if (expr instanceof AST_VarDef) {
var def = expr.name.definition(); var def = expr.name.definition();
if (def.orig.length > 1 if (def.orig.length > 1
|| def.references.length == 1 && (!def.global || compressor.toplevel(def))) { || def.references.length == 1 && !compressor.exposed(def)) {
return make_node(AST_SymbolRef, expr.name, expr.name); return make_node(AST_SymbolRef, expr.name, expr.name);
} }
} else { } else {
@@ -3918,7 +3918,7 @@ merge(Compressor.prototype, {
} }
var name_length = d.name.length; var name_length = d.name.length;
var overhead = 0; var overhead = 0;
if (compressor.option("unused") && (!d.global || compressor.toplevel(d))) { if (compressor.option("unused") && !compressor.exposed(d)) {
overhead = (name_length + 2 + value_length) / d.references.length; overhead = (name_length + 2 + value_length) / d.references.length;
} }
d.should_replace = value_length <= name_length + overhead ? fn : false; d.should_replace = value_length <= name_length + overhead ? fn : false;