diff options
author | Iulian Dragos <jaguarul@gmail.com> | 2011-03-04 16:10:36 +0000 |
---|---|---|
committer | Iulian Dragos <jaguarul@gmail.com> | 2011-03-04 16:10:36 +0000 |
commit | e586206e08e70b22d33152c7802d658577fddcf5 (patch) | |
tree | f97b4c71b6a69b22c64da4c1d687bedc74908b45 /test/files/run | |
parent | 305e7aa380452199139ccdd86f93caa2c923fc2a (diff) | |
download | scala-e586206e08e70b22d33152c7802d658577fddcf5.tar.gz scala-e586206e08e70b22d33152c7802d658577fddcf5.tar.bz2 scala-e586206e08e70b22d33152c7802d658577fddcf5.zip |
Renamed some methods in icode exception handler...
Renamed some methods in icode exception handlers for clarification,
fixed finalizers for 'return' inside a catch block. closes #4240. review
by rytz.
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/finally.check | 2 | ||||
-rw-r--r-- | test/files/run/finally.scala | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/test/files/run/finally.check b/test/files/run/finally.check index 4e66e2b5cb..fa565c8e8a 100644 --- a/test/files/run/finally.check +++ b/test/files/run/finally.check @@ -1,3 +1,5 @@ hi In Finally java.lang.RuntimeException: ouch +java.lang.Exception +in finally diff --git a/test/files/run/finally.scala b/test/files/run/finally.scala index e4715c59ae..0da616cfdd 100644 --- a/test/files/run/finally.scala +++ b/test/files/run/finally.scala @@ -6,7 +6,7 @@ object Test extends App { println("hi") } catch { - case e => println("GOT HERE") + case e => println("SHOULD NOT GET HERE") } finally { println("In Finally") @@ -14,9 +14,21 @@ object Test extends App { } } + def m1 { + try { + throw new Exception + } catch { + case e => + println(e); + return + } finally println("in finally") + } + try { bar } catch { case e => println(e) } + + m1 } |