in-place join_vars
This commit is contained in:
parent
f044a8efa4
commit
eca96f1905
|
|
@ -679,7 +679,7 @@ merge(Compressor.prototype, {
|
|||
statements = sequencesize(statements, compressor);
|
||||
}
|
||||
if (compressor.option("join_vars")) {
|
||||
statements = join_consecutive_vars(statements, compressor);
|
||||
join_consecutive_vars(statements, compressor);
|
||||
}
|
||||
if (compressor.option("collapse_vars")) {
|
||||
collapse(statements, compressor);
|
||||
|
|
@ -1173,8 +1173,9 @@ merge(Compressor.prototype, {
|
|||
};
|
||||
|
||||
function join_consecutive_vars(statements, compressor) {
|
||||
var prev = null;
|
||||
return statements.reduce(function(a, stat){
|
||||
for (var i = 0, j = -1, len = statements.length; i < len; i++) {
|
||||
var stat = statements[i];
|
||||
var prev = statements[j];
|
||||
if (stat instanceof AST_Definitions && prev && prev.TYPE == stat.TYPE) {
|
||||
prev.definitions = prev.definitions.concat(stat.definitions);
|
||||
CHANGED = true;
|
||||
|
|
@ -1183,21 +1184,18 @@ merge(Compressor.prototype, {
|
|||
&& prev instanceof AST_Var
|
||||
&& (!stat.init || stat.init.TYPE == prev.TYPE)) {
|
||||
CHANGED = true;
|
||||
a.pop();
|
||||
if (stat.init) {
|
||||
stat.init.definitions = prev.definitions.concat(stat.init.definitions);
|
||||
} else {
|
||||
stat.init = prev;
|
||||
}
|
||||
a.push(stat);
|
||||
prev = stat;
|
||||
statements[j] = stat;
|
||||
}
|
||||
else {
|
||||
prev = stat;
|
||||
a.push(stat);
|
||||
statements[++j] = stat;
|
||||
}
|
||||
return a;
|
||||
}, []);
|
||||
}
|
||||
statements.length = j + 1;
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user