return null;
}
+ function find_stop_logical(parent, op, level) {
+ var node;
+ do {
+ node = parent;
+ parent = scanner.parent(++level);
+ } while (parent instanceof AST_Assign && parent.operator.slice(0, -1) == op
+ || parent instanceof AST_Binary && parent.operator == op);
+ return node;
+ }
+
function find_stop_value(node, level) {
var parent = scanner.parent(level);
if (parent instanceof AST_Array) return find_stop_value(parent, level + 1);
- if (parent instanceof AST_Assign) return may_throw(parent) || parent.left.match_symbol(function(ref) {
- return ref instanceof AST_SymbolRef && (lhs.name == ref.name || value_def.name == ref.name);
- }) ? node : find_stop_value(parent, level + 1);
+ if (parent instanceof AST_Assign) {
+ if (may_throw(parent)) return node;
+ if (parent.left.match_symbol(function(ref) {
+ return ref instanceof AST_SymbolRef && (lhs.name == ref.name || value_def.name == ref.name);
+ })) return node;
+ var op;
+ if (parent.left === node || !lazy_op[op = parent.operator.slice(0, -1)]) {
+ return find_stop_value(parent, level + 1);
+ }
+ return find_stop_logical(parent, op, level);
+ }
if (parent instanceof AST_Binary) {
- if (lazy_op[parent.operator] && parent.left !== node) {
- do {
- node = parent;
- parent = scanner.parent(++level);
- } while (parent instanceof AST_Binary && parent.operator == node.operator);
- return node;
+ var op;
+ if (parent.left === node || !lazy_op[op = parent.operator]) {
+ return find_stop_value(parent, level + 1);
}
- return find_stop_value(parent, level + 1);
+ return find_stop_logical(parent, op, level);
}
if (parent instanceof AST_Call) return parent;
if (parent instanceof AST_Case) {
var tw = new TreeWalker(function(node, descend) {
if (node instanceof AST_Assign) {
var lhs = node.left;
+ var rhs = node.right;
if (lhs instanceof AST_Destructured) {
- node.right.walk(tw);
+ rhs.walk(tw);
var marker = new TreeWalker(function(node) {
if (node instanceof AST_Destructured) return;
if (node instanceof AST_DefaultValue) {
lhs.walk(marker);
return true;
}
+ if (lazy_op[node.operator.slice(0, -1)]) {
+ lhs.walk(tw);
+ push();
+ rhs.walk(tw);
+ if (lhs instanceof AST_SymbolRef) mark(lhs);
+ pop();
+ return true;
+ }
if (lhs instanceof AST_SymbolRef) {
if (node.operator != "=") mark(lhs, true);
- node.right.walk(tw);
+ rhs.walk(tw);
mark(lhs);
return true;
}