diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2008-12-03 16:52:00 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2008-12-03 16:52:00 +0000 |
| commit | c8107b0d95890b29ffebe101fc54ce0885511de4 (patch) | |
| tree | 5ab6b29e313861f1ca3824485184bd7412b9fcc5 /src/compiler | |
| parent | c3c87411ce473b7f1f2e9638d682adbf27ea8b49 (diff) | |
| download | scala-c8107b0d95890b29ffebe101fc54ce0885511de4.tar.gz scala-c8107b0d95890b29ffebe101fc54ce0885511de4.tar.bz2 scala-c8107b0d95890b29ffebe101fc54ce0885511de4.zip | |
Fixed #1358.
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() => |