diff options
Diffstat (limited to 'tools/js_optimizer.py')
| -rw-r--r-- | tools/js_optimizer.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/js_optimizer.py b/tools/js_optimizer.py index 256c03cf..905ae835 100644 --- a/tools/js_optimizer.py +++ b/tools/js_optimizer.py @@ -36,7 +36,7 @@ class Minifier: MAX_NAMES = 80000 INVALID_2 = set(['do', 'if', 'in']) - INVALID_3 = set(['for', 'new', 'try', 'var', 'env']) + INVALID_3 = set(['for', 'new', 'try', 'var', 'env', 'let']) self.names = [] init_possibles = string.ascii_letters + '_$' @@ -73,7 +73,7 @@ class Minifier: f = open(temp_file, 'w') f.write(shell) f.write('\n') - f.write('// MINIFY_INFO:' + self.serialize()) + f.write('// EXTRA_INFO:' + self.serialize()) f.close() output = subprocess.Popen(self.js_engine + @@ -84,7 +84,7 @@ class Minifier: assert len(output) > 0 and not output.startswith('Assertion failed'), 'Error in js optimizer: ' + output #print >> sys.stderr, "minified SHELL 3333333333333333", output, "\n44444444444444444444" - code, metadata = output.split('// MINIFY_INFO:') + code, metadata = output.split('// EXTRA_INFO:') self.globs = json.loads(metadata) return code.replace('13371337', '0.0') @@ -135,9 +135,9 @@ def run_on_js(filename, passes, js_engine, jcache, source_map=False): end_funcs = js.rfind(end_funcs_marker) #assert (start_funcs >= 0) == (end_funcs >= 0) == (not not suffix) - minify_globals = 'minifyGlobals' in passes and 'registerize' in passes and 'asm' in passes + minify_globals = 'registerizeAndMinify' in passes and 'asm' in passes if minify_globals: - passes = filter(lambda p: p != 'minifyGlobals', passes) # we will run it manually + passes = map(lambda p: p if p != 'registerizeAndMinify' else 'registerize', passes) start_asm_marker = '// EMSCRIPTEN_START_ASM\n' end_asm_marker = '// EMSCRIPTEN_END_ASM\n' start_asm = js.find(start_asm_marker) @@ -250,7 +250,7 @@ EMSCRIPTEN_FUNCS(); f.write(suffix_marker) if minify_globals: f.write('\n') - f.write('// MINIFY_INFO:' + minify_info) + f.write('// EXTRA_INFO:' + minify_info) f.close() return temp_file filenames = [write_chunk(chunks[i], i) for i in range(len(chunks))] |