This commit is contained in:
Mihai Bazon
2013-12-16 20:37:09 +02:00
parent b634018618
commit f65e55dff4

View File

@@ -246,14 +246,14 @@ AST_Scope.DEFMETHOD("next_mangled", function(options){
out: while (true) { out: while (true) {
var m = base54(++this.cname); var m = base54(++this.cname);
if (!is_identifier(m)) continue; // skip over "do" 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 // we must ensure that the mangled name does not shadow a name
// from some parent scope that is referenced in this or in // from some parent scope that is referenced in this or in
// inner scopes. // inner scopes.
//bugfix: https://github.com/mishoo/UglifyJS2/issues/242
if(options.except.indexOf(m) !== -1){
continue;
}
for (var i = ext.length; --i >= 0;) { for (var i = ext.length; --i >= 0;) {
var sym = ext[i]; var sym = ext[i];
var name = sym.mangled_name || (sym.unmangleable(options) && sym.name); var name = sym.mangled_name || (sym.unmangleable(options) && sym.name);