Options now passed to nameGenerator.reset (#3436).

This commit is contained in:
jameswilddev 2019-07-20 23:16:53 +01:00
parent 9347f007f4
commit 0d97291ba2

View File

@ -478,9 +478,9 @@ AST_Toplevel.DEFMETHOD("find_colliding_names", function(options) {
});
AST_Toplevel.DEFMETHOD("expand_names", function(options) {
nameGenerator.reset();
nameGenerator.sort();
options = _default_mangler_options(options);
nameGenerator.reset(options);
nameGenerator.sort();
var avoid = this.find_colliding_names(options);
var cname = 0;
this.globals.each(rename);
@ -519,7 +519,7 @@ AST_Sequence.DEFMETHOD("tail_node", function() {
AST_Toplevel.DEFMETHOD("compute_char_frequency", function(options) {
options = _default_mangler_options(options);
nameGenerator.reset();
nameGenerator.reset(options);
try {
AST_Node.prototype.print = function(stream, force_parens) {
this._print(stream, force_parens);
@ -565,7 +565,7 @@ var nameGenerator = (function() {
var trailing = init("0123456789");
var leading = init("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_");
var chars, frequency;
function reset() {
function reset(options) {
frequency = Object.create(freq);
}
nameGenerator.consider = function(str, delta) {
@ -580,7 +580,6 @@ var nameGenerator = (function() {
chars = leading.sort(compare).concat(trailing.sort(compare));
};
nameGenerator.reset = reset;
reset();
function nameGenerator(num) {
var ret = "", base = 54;
num++;