From: Mihai Bazon <mihai@bazon.net>
Date: Mon, 16 Dec 2013 18:37:09 +0000 (+0200)
Subject: minor
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=f65e55dff40334bda8eed4f77b88a1c90af27d7c;p=UglifyJS.git

minor
---

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);