From d0d37f8e2e93d6de47845e0c6bf0f114192a7cb0 Mon Sep 17 00:00:00 2001
From: Anat Dagan <anadt@ironsrc.com>
Date: Thu, 9 Feb 2017 13:41:53 +0200
Subject: [PATCH] rename illegal_mangled_names to illegalmangled

---
 lib/propmangle.js                   | 12 ++++++------
 lib/scope.js                        | 10 +++++-----
 test/mocha/illegal_mangled_names.js | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/propmangle.js b/lib/propmangle.js
index f50b4cc4..1eb58550 100644
--- a/lib/propmangle.js
+++ b/lib/propmangle.js
@@ -124,16 +124,16 @@ function mangle_properties(ast, options) {
         only_cache : false,
         regex : null,
         ignore_quoted : false,
-        illegal_mangled_names: null,
+        illegalmangled: null,
         debug : false
     });
 
     var reserved = options.reserved;
     if (reserved == null)
         reserved = find_builtins();
-    var illegal_mangled_names = options.illegal_mangled_names;
-    if (illegal_mangled_names == null)
-        illegal_mangled_names = find_js_reserved_words();
+    var illegalmangled = options.illegalmangled;
+    if (illegalmangled == null)
+        illegalmangled = find_js_reserved_words();
     var cache = options.cache;
     if (cache == null) {
         cache = {
@@ -158,8 +158,8 @@ function mangle_properties(ast, options) {
     var unmangleable = [];
     var ignored = {};
 
-    if (illegal_mangled_names) {
-        unmangleable = unmangleable.concat(illegal_mangled_names);
+    if (illegalmangled) {
+        unmangleable = unmangleable.concat(illegalmangled);
     }
     // step 1: find candidates to mangle
     ast.walk(new TreeWalker(function(node){
diff --git a/lib/scope.js b/lib/scope.js
index 8d3f43cc..1bb922d3 100644
--- a/lib/scope.js
+++ b/lib/scope.js
@@ -306,10 +306,10 @@ AST_Scope.DEFMETHOD("def_variable", function(symbol){
 
 AST_Scope.DEFMETHOD("next_mangled", function(options){
     var ext = this.enclosed;
-    var illegal_mangled_names = options.illegal_mangled_names || [];
+    var illegalmangled = options.illegalmangled || [];
     out: while (true) {
         var m = base54(++this.cname);
-        if (illegal_mangled_names.indexOf(m) !== -1) continue; //this name is illegal
+        if (illegalmangled.indexOf(m) !== -1) continue; //this name is illegal
         if (!is_identifier(m)) continue; // skip over "do"
 
         // https://github.com/mishoo/UglifyJS2/issues/242 -- do not
@@ -397,15 +397,15 @@ AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options){
         sort        : false, // Ignored. Flag retained for backwards compatibility.
         toplevel    : false,
         screw_ie8   : true,
-        illegal_mangled_names: null,
+        illegalmangled: null,
         keep_fnames : false
     });
 });
 
 AST_Toplevel.DEFMETHOD("mangle_names", function(options){
     options = this._default_mangler_options(options);
-    if (options.illegal_mangled_names == null)
-        options.illegal_mangled_names = find_js_reserved_words();
+    if (options.illegalmangled == null)
+        options.illegalmangled = find_js_reserved_words();
     // Never mangle arguments
     options.except.push('arguments');
 
diff --git a/test/mocha/illegal_mangled_names.js b/test/mocha/illegal_mangled_names.js
index 97ad9907..b40e17e9 100644
--- a/test/mocha/illegal_mangled_names.js
+++ b/test/mocha/illegal_mangled_names.js
@@ -5,7 +5,7 @@ var assert = require("assert");
 var uglify = require("../../");
 
 describe("verify that the mangled names are legal", function () {
-    it("Should not mangle properties to names in the illegal_mangled_names param", function () {
+    it("Should not mangle properties to names in the illegalmangled param", function () {
         var js = 'a["foo"] = "bar"; a.color = "red"; x = {"bar": 10};';
         var result = uglify.minify(js, {
             fromString: true,
@@ -14,7 +14,7 @@ describe("verify that the mangled names are legal", function () {
             },
             mangleProperties: {
                 ignore_quoted: true,
-                illegal_mangled_names: ["a"]
+                illegalmangled: ["a"]
             },
             output: {
                 keep_quoted_props: true,
@@ -24,7 +24,7 @@ describe("verify that the mangled names are legal", function () {
         assert.strictEqual(result.code,
             'a["foo"]="bar",a.b="red",x={"bar":10};');
     });
-    it("Should not mangle names to names in the illegal_mangled_names param", function () {
+    it("Should not mangle names to names in the illegalmangled param", function () {
         var js = 'var a; a["foo"] = "bar"; a.color = "red"; x = {"bar": 10};';
         var result = uglify.minify(js, {
             fromString: true,
@@ -34,7 +34,7 @@ describe("verify that the mangled names are legal", function () {
             mangleProperties: {
                 ignore_quoted: true
             },
-            mangle: {toplevel: true, illegal_mangled_names: ["r", "a"]},
+            mangle: {toplevel: true, illegalmangled: ["r", "a"]},
             output: {
                 keep_quoted_props: true,
                 quote_style: 3
@@ -43,7 +43,7 @@ describe("verify that the mangled names are legal", function () {
         assert.strictEqual(result.code,
             'var b;b["foo"]="bar",b.a="red",x={"bar":10};');
     });
-    it("Should not fail without illegal_mangled_names param", function () {
+    it("Should not fail without illegalmangled param", function () {
         var js = 'var b; b["foo"] = "bar"; b.color = "red"; x = {"bar": 10};';
         var result = uglify.minify(js, {
             fromString: true,