diff options
author | Dmitry Petrashko <dark@d-d.me> | 2015-06-03 18:33:47 +0200 |
---|---|---|
committer | Dmitry Petrashko <dark@d-d.me> | 2015-06-03 18:33:47 +0200 |
commit | c0770edba1f5ba85b5a48f2c2ce68704dbe00087 (patch) | |
tree | 874c93beea0cb95499420b2f7c29781155d08041 /tests | |
parent | 57a2a014593278c752fb645f9005ed16b4447242 (diff) | |
parent | bcf70e27e0eef1b55c2e4afd8f680c0351810073 (diff) | |
download | dotty-c0770edba1f5ba85b5a48f2c2ce68704dbe00087.tar.gz dotty-c0770edba1f5ba85b5a48f2c2ce68704dbe00087.tar.bz2 dotty-c0770edba1f5ba85b5a48f2c2ce68704dbe00087.zip |
Merge pull request #628 from dotty-staging/fix/initializer-deadlocks
Fix/initializer deadlocks
Diffstat (limited to 'tests')
-rw-r--r-- | tests/pending/pos/lambdalift-1.scala | 20 | ||||
-rw-r--r-- | tests/pos/lambdalift.scala | 21 | ||||
-rw-r--r-- | tests/pos/llift.scala | 9 | ||||
-rw-r--r-- | tests/run/t5375.scala | 13 | ||||
-rw-r--r-- | tests/run/t6052.scala | 10 | ||||
-rw-r--r-- | tests/run/t6260-delambdafy.check | 1 | ||||
-rw-r--r-- | tests/run/t6410.scala | 12 | ||||
-rw-r--r-- | tests/run/t6467.scala | 12 | ||||
-rw-r--r-- | tests/run/t7498.scala | 10 |
9 files changed, 53 insertions, 55 deletions
diff --git a/tests/pending/pos/lambdalift-1.scala b/tests/pending/pos/lambdalift-1.scala new file mode 100644 index 000000000..269f839d6 --- /dev/null +++ b/tests/pending/pos/lambdalift-1.scala @@ -0,0 +1,20 @@ +class Super(x: Int) + +class Sub extends Super({ + def foo3(x: Int) = { + + class C { + def this(name: String) = this() + + def bam(y: Int): String => Int = { + def baz = x + y + z => baz * z.length + } + } + + val fun = new C("dummy").bam(1) + fun("abc") + + } + foo3(22) +}) diff --git a/tests/pos/lambdalift.scala b/tests/pos/lambdalift.scala index febae6828..33cc2c069 100644 --- a/tests/pos/lambdalift.scala +++ b/tests/pos/lambdalift.scala @@ -23,24 +23,3 @@ object test { } } - -class Super(x: Int) - -class Sub extends Super({ - def foo3(x: Int) = { - - class C { - def this(name: String) = this() - - def bam(y: Int): String => Int = { - def baz = x + y - z => baz * z.length - } - } - - val fun = new C("dummy").bam(1) - fun("abc") - - } - foo3(22) -}) diff --git a/tests/pos/llift.scala b/tests/pos/llift.scala new file mode 100644 index 000000000..51631ac97 --- /dev/null +++ b/tests/pos/llift.scala @@ -0,0 +1,9 @@ +class A { + class B { + def outer(): Unit = { + def inner(): Int = 2 + + val fi: Function0[Int] = () => inner() + } + } +} diff --git a/tests/run/t5375.scala b/tests/run/t5375.scala index 256f5435e..8c2c06fde 100644 --- a/tests/run/t5375.scala +++ b/tests/run/t5375.scala @@ -1,11 +1,8 @@ -object Test { +object Test extends dotty.runtime.LegacyApp { val foos = (1 to 1000).toSeq - - def main(args: Array[String]): Unit = { - try - foos.par.map(i => if (i % 37 == 0) sys.error("i div 37") else i) - catch { - case ex: RuntimeException => println("Runtime exception") - } + try + foos.par.map(i => if (i % 37 == 0) sys.error("i div 37") else i) + catch { + case ex: RuntimeException => println("Runtime exception") } } diff --git a/tests/run/t6052.scala b/tests/run/t6052.scala index 15bffc1eb..e740f00e1 100644 --- a/tests/run/t6052.scala +++ b/tests/run/t6052.scala @@ -5,7 +5,7 @@ -object Test { +object Test extends dotty.runtime.LegacyApp { def seqarr(i: Int) = Array[Int]() ++ (0 until i) def pararr(i: Int) = seqarr(i).par @@ -15,9 +15,7 @@ object Test { assert(gseq == gpar, (gseq, gpar)) } - def main(args: Array[String]): Unit = { - for (i <- 0 until 20) check(i, _ > 0) - for (i <- 0 until 20) check(i, _ % 2) - for (i <- 0 until 20) check(i, _ % 4) - } + for (i <- 0 until 20) check(i, _ > 0) + for (i <- 0 until 20) check(i, _ % 2) + for (i <- 0 until 20) check(i, _ % 4) } diff --git a/tests/run/t6260-delambdafy.check b/tests/run/t6260-delambdafy.check index eb7212adc..b3ec1b3cc 100644 --- a/tests/run/t6260-delambdafy.check +++ b/tests/run/t6260-delambdafy.check @@ -1,3 +1,4 @@ f(C@2e) apply +get$Lambda diff --git a/tests/run/t6410.scala b/tests/run/t6410.scala index 51aaad839..0855ffecd 100644 --- a/tests/run/t6410.scala +++ b/tests/run/t6410.scala @@ -1,11 +1,9 @@ -object Test { - def main(args: Array[String]): Unit = { - val x = collection.parallel.mutable.ParArray.range(1,10) groupBy { _ % 2 } mapValues { _.size } - println(x) - val y = collection.parallel.immutable.ParVector.range(1,10) groupBy { _ % 2 } mapValues { _.size } - println(y) - } +object Test extends dotty.runtime.LegacyApp { + val x = collection.parallel.mutable.ParArray.range(1,10) groupBy { _ % 2 } mapValues { _.size } + println(x) + val y = collection.parallel.immutable.ParVector.range(1,10) groupBy { _ % 2 } mapValues { _.size } + println(y) } diff --git a/tests/run/t6467.scala b/tests/run/t6467.scala index 048ef25e2..e02fb1669 100644 --- a/tests/run/t6467.scala +++ b/tests/run/t6467.scala @@ -6,17 +6,15 @@ import collection._ -object Test { +object Test extends dotty.runtime.LegacyApp { def compare(s1: String, s2: String): Unit = { assert(s1 == s2, s1 + "\nvs.\n" + s2) } - def main(args: Array[String]): Unit = { - compare(List(1, 2, 3, 4).aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, "1234") - compare(List(1, 2, 3, 4).par.aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, "1234") - compare(Seq(0 until 100: _*).aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, (0 until 100).mkString) - compare(Seq(0 until 100: _*).par.aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, (0 until 100).mkString) - } + compare(List(1, 2, 3, 4).aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, "1234") + compare(List(1, 2, 3, 4).par.aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, "1234") + compare(Seq(0 until 100: _*).aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, (0 until 100).mkString) + compare(Seq(0 until 100: _*).par.aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, (0 until 100).mkString) } diff --git a/tests/run/t7498.scala b/tests/run/t7498.scala index a2555c6b1..cab598405 100644 --- a/tests/run/t7498.scala +++ b/tests/run/t7498.scala @@ -5,18 +5,16 @@ -object Test { +object Test extends dotty.runtime.LegacyApp { import scala.collection.concurrent.TrieMap class Collision(val idx: Int) { override def hashCode = idx % 10 } - def main(args: Array[String]): Unit = { - val tm = TrieMap[Collision, Unit]() - for (i <- 0 until 1000) tm(new Collision(i)) = () + val tm = TrieMap[Collision, Unit]() + for (i <- 0 until 1000) tm(new Collision(i)) = () - tm.par.foreach(kv => ()) - } + tm.par.foreach(kv => ()) } |