diff options
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/UnCurry.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala b/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala index 94c19baa34..10feac1b4a 100644 --- a/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala +++ b/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala @@ -138,7 +138,7 @@ abstract class TreeBrowsers { var splitPane: JSplitPane = _ var treeModel: TreeModel = _ - val textArea: JTextArea = new JTextArea(20, 50) + val textArea: JTextArea = new JTextArea(20, 150) val infoPanel = new TextInfoPanel() /** Create a frame that displays the AST. diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala index bb552de8b9..2548375e93 100644 --- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala +++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala @@ -628,7 +628,7 @@ abstract class UnCurry extends InfoTransform with TypingTransformers { applyUnary(tree) case TypeApply(_, _) => applyUnary(tree) - case Return(expr) if (tree.symbol != currentOwner.enclMethod) => + case Return(expr) if (tree.symbol != currentOwner.enclMethod || currentOwner.hasFlag(LAZY)) => if (settings.debug.value) log("non local return in "+tree.symbol+" from "+currentOwner.enclMethod) atPos(tree.pos)(nonLocalReturnThrow(expr, tree.symbol)) case TypeTree() => |