Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify: we always remove all the variables.

Browse Source
This commit is contained in:
ccd0 2016-04-13 17:19:06 -07:00
parent d82418ed45
commit 378e1d26d4
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/globalize.js
View File

@ -20,29 +20,13 @@ var replaced = 0;
script = script.replace(
// matches declaration at the start of the function, not including helper function assignments
/ *\bvar\s+[$\w]+(,\s*[$\w]+)*(,\s*|;\n)/,
function(declaration) {
var parts = declaration.split(/([$\w]+)(?=[,;])/);
for (var name of names) {
var i = parts.indexOf(name);
if (i < 0) {
throw new Error(`${filename}: ${name} not found`);
} else if (i !== 1) {
// not first: remove variable and separator before it
parts.splice(i - 1, 2);
} else if (!(i === parts.length - 2 && parts[parts.length - 1][0] === ';')) {
// not last: remove variable and separator after it
parts.splice(i, 2);
} else {
// removing only variable: nuke whole declaration
parts = [];
}
}
/^( *var )(.*)(,\n *|;\n)/m,
function(declaration, v, n, e) {
replaced++;
return parts.join('');
var n0 = names.sort().join(', ');
if (n0 !== n) throw new Error(`${filename}: expected variables (${n0}) found (${n})`);
return (e[0] === ',') ? v : '';
}
);