diff options
Diffstat (limited to 'lib/scope.js')
| -rw-r--r-- | lib/scope.js | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/lib/scope.js b/lib/scope.js index ef0ac6ed..79d6e91d 100644 --- a/lib/scope.js +++ b/lib/scope.js @@ -101,8 +101,28 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(){ } if (node instanceof AST_Label) { node.init_scope_vars(); + var p = tw.parent(); // AST_LabeledStatement + var block = p.body; + if (block instanceof AST_StatementWithBody) + block = block.body; + node.label_target = block; } - if (node instanceof AST_SymbolLambda) { + if (node instanceof AST_LoopControl) { + if (!node.label) { + var a = tw.stack, i = a.length - 1; + while (--i >= 0) { + var p = a[i]; + if (p instanceof AST_For + || p instanceof AST_ForIn + || p instanceof AST_DWLoop + || p instanceof AST_Switch) { + node.loopcontrol_target = p.body; + break; + } + } + } + } + else if (node instanceof AST_SymbolLambda) { scope.def_function(node); } else if (node instanceof AST_SymbolDefun) { @@ -272,6 +292,11 @@ AST_Symbol.DEFMETHOD("global", function(){ return this.definition().global; }); +AST_LoopControl.DEFMETHOD("target", function(){ + if (this.label) return this.label.definition().label_target; + return this.loopcontrol_target; +}); + AST_Toplevel.DEFMETHOD("mangle_names", function(){ // We only need to mangle declaration nodes. Special logic wired // into the code generator will display the mangled name if it's |