aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Bazon <mihai@bazon.net>2013-12-16 20:37:09 +0200
committerMihai Bazon <mihai@bazon.net>2013-12-16 20:37:09 +0200
commitf65e55dff40334bda8eed4f77b88a1c90af27d7c (patch)
treebe3eae701b6ea2c23a9d77c4833bb6fafe1f259d
parentb634018618069653f08dad79026dd621ec7d90a0 (diff)
downloadtracifyjs-f65e55dff40334bda8eed4f77b88a1c90af27d7c.tar.gz
tracifyjs-f65e55dff40334bda8eed4f77b88a1c90af27d7c.zip
minor
-rw-r--r--lib/scope.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/scope.js b/lib/scope.js
index de0bd965..cce0f3c5 100644
--- a/lib/scope.js
+++ b/lib/scope.js
@@ -246,14 +246,14 @@ AST_Scope.DEFMETHOD("next_mangled", function(options){
out: while (true) {
var m = base54(++this.cname);
if (!is_identifier(m)) continue; // skip over "do"
+
+ // https://github.com/mishoo/UglifyJS2/issues/242 -- do not
+ // shadow a name excepted from mangling.
+ if (options.except.indexOf(m) >= 0) continue;
+
// we must ensure that the mangled name does not shadow a name
// from some parent scope that is referenced in this or in
// inner scopes.
-
- //bugfix: https://github.com/mishoo/UglifyJS2/issues/242
- if(options.except.indexOf(m) !== -1){
- continue;
- }
for (var i = ext.length; --i >= 0;) {
var sym = ext[i];
var name = sym.mangled_name || (sym.unmangleable(options) && sym.name);