summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-03-01 12:24:18 -0800
committerPaul Phillips <paulp@improving.org>2012-03-01 12:24:18 -0800
commit0fccb4ee76b55dea2073f234b4626c145ebd1b2f (patch)
tree20f4d9ac2cf95cb12a690f4b16cbd93dabc56aa4 /test/files
parent84ab871a18c2a5b2d4dce8c2f42b47f1aada2a09 (diff)
parentedf3ae0b8c3688b5cacbe2f7e2ae826f5fbb7644 (diff)
downloadscala-0fccb4ee76b55dea2073f234b4626c145ebd1b2f.tar.gz
scala-0fccb4ee76b55dea2073f234b4626c145ebd1b2f.tar.bz2
scala-0fccb4ee76b55dea2073f234b4626c145ebd1b2f.zip
Merge remote-tracking branch 'szabolcsberecz/SI-5380' into develop
Conflicts: src/compiler/scala/tools/nsc/transform/UnCurry.scala
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/si5380.scala6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/files/run/si5380.scala b/test/files/run/si5380.scala
new file mode 100644
index 0000000000..6083161a9b
--- /dev/null
+++ b/test/files/run/si5380.scala
@@ -0,0 +1,6 @@
+object Test {
+ def main(args: Array[String]) {
+ val f = () => return try { 1 } catch { case _ => 0 }
+ f()
+ }
+}