mark_escaped(tw, d, scope, parent, value, level + 1, depth + 1);
if (value) return;
}
- if (level == 0) d.direct_access = true;
+ if (level > 0) return;
+ if (parent instanceof AST_Sequence && node !== parent.tail_node()) return;
+ if (parent instanceof AST_SimpleStatement) return;
+ d.direct_access = true;
}
var suppressor = new TreeWalker(function(node) {
walk_defuns(tw, this);
return true;
});
- def(AST_Assign, function(tw) {
+ def(AST_Assign, function(tw, descend, compressor) {
var node = this;
- if (!(node.left instanceof AST_SymbolRef)) return;
- var d = node.left.definition();
+ var sym = node.left;
+ if (!(sym instanceof AST_SymbolRef)) return;
+ var d = sym.definition();
var fixed = d.fixed;
if (!fixed && node.operator != "=") return;
- if (!safe_to_assign(tw, d, node.left.scope, node.right)) return;
- d.references.push(node.left);
+ if (!safe_to_assign(tw, d, sym.scope, node.right)) return;
+ var eq = node.operator == "=";
+ var value = eq ? node.right : node;
+ if (is_modified(compressor, tw, node, value, 0)) return;
+ d.references.push(sym);
d.assignments++;
- if (node.operator != "=") d.chained = true;
- d.fixed = node.operator == "=" ? function() {
+ if (!eq) d.chained = true;
+ d.fixed = eq ? function() {
return node.right;
} : function() {
return make_node(AST_Binary, node, {
mark(tw, d, false);
node.right.walk(tw);
mark(tw, d, true);
+ mark_escaped(tw, d, sym.scope, node, value, 0, 1);
return true;
});
def(AST_Binary, function(tw) {
func = func.fixed_value();
}
if (func instanceof AST_Lambda && !func.contains_this()) {
- return make_sequence(this, [
+ return (self.args.length ? make_sequence(this, [
self.args[0],
make_node(AST_Call, self, {
expression: exp.expression,
args: self.args.slice(1)
})
- ]).optimize(compressor);
+ ]) : make_node(AST_Call, self, {
+ expression: exp.expression,
+ args: []
+ })).optimize(compressor);
}
break;
}