});
}
- function can_merge_flow(ab) {
+ function can_drop_abort(ab) {
if (ab instanceof AST_Return) return in_lambda && is_return_void(ab.value);
if (!(ab instanceof AST_LoopControl)) return false;
var lct = compressor.loopcontrol_target(ab);
return match_target(lct);
}
+ function can_merge_flow(ab) {
+ if (!can_drop_abort(ab)) return false;
+ for (var j = statements.length; --j > i;) {
+ var stat = statements[j];
+ if (stat instanceof AST_DefClass) {
+ if (stat.name.definition().preinit) return false;
+ } else if (stat instanceof AST_Const || stat instanceof AST_Let) {
+ if (!all(stat.definitions, function(defn) {
+ return !defn.name.match_symbol(function(node) {
+ return node instanceof AST_SymbolDeclaration && node.definition().preinit;
+ });
+ })) return false;
+ }
+ }
+ return true;
+ }
+
function extract_functions() {
var defuns = [];
+ var lexical = false;
var tail = statements.splice(i + 1).filter(function(stat) {
if (stat instanceof AST_LambdaDefinition) {
defuns.push(stat);
return false;
}
+ if (is_lexical_definition(stat)) lexical = true;
return true;
});
- [].push.apply(all(tail, safe_to_trim) ? statements : tail, defuns);
+ [].push.apply(lexical ? tail : statements, defuns);
return tail;
}
return true;
}
if (node instanceof AST_SymbolDeclaration) {
+ var def = node.definition();
+ def.preinit = def.references.length;
if (node instanceof AST_SymbolCatch) {
// ensure mangling works if `catch` reuses a scope variable
- var def = node.definition().redefined();
- if (def) for (var s = node.scope; s; s = s.parent_scope) {
- push_uniq(s.enclosed, def);
- if (s === def.scope) break;
+ var redef = def.redefined();
+ if (redef) for (var s = node.scope; s; s = s.parent_scope) {
+ push_uniq(s.enclosed, redef);
+ if (s === redef.scope) break;
}
} else if (node instanceof AST_SymbolConst) {
// ensure compression works if `const` reuses a scope variable
- var redef = node.definition().redefined();
+ var redef = def.redefined();
if (redef) redef.const_redefs = true;
}
if (node.name != "arguments") return true;