From ebcec5f4d657afb3dbde33128d021ec760cb528b Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 17 Mar 2011 22:40:54 +0000 Subject: Reenabled the commented out bits of the test fo... Reenabled the commented out bits of the test for #1642. No review. --- test/files/pos/t1642/JavaCallingScalaHashMap.java | 6 +++--- test/files/pos/t1642/test.scala | 6 ------ test/files/pos/t1642b.scala | 6 ++++++ 3 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 test/files/pos/t1642/test.scala create mode 100644 test/files/pos/t1642b.scala (limited to 'test/files/pos') diff --git a/test/files/pos/t1642/JavaCallingScalaHashMap.java b/test/files/pos/t1642/JavaCallingScalaHashMap.java index bde3bd39c4..976e465ff7 100644 --- a/test/files/pos/t1642/JavaCallingScalaHashMap.java +++ b/test/files/pos/t1642/JavaCallingScalaHashMap.java @@ -1,8 +1,8 @@ -// import scala.collection.immutable.HashMap; -// import scala.collection.immutable.Map; +import scala.collection.immutable.HashMap; +import scala.collection.immutable.Map; public class JavaCallingScalaHashMap { public static void main( String[] args ) { - // Map hashMap = new HashMap(); + Map hashMap = new HashMap(); } } diff --git a/test/files/pos/t1642/test.scala b/test/files/pos/t1642/test.scala deleted file mode 100644 index 72e53b0c9a..0000000000 --- a/test/files/pos/t1642/test.scala +++ /dev/null @@ -1,6 +0,0 @@ -package x -abstract class H[A] { - type P <: R[P] - def a: P -} -class R[F] diff --git a/test/files/pos/t1642b.scala b/test/files/pos/t1642b.scala new file mode 100644 index 0000000000..72e53b0c9a --- /dev/null +++ b/test/files/pos/t1642b.scala @@ -0,0 +1,6 @@ +package x +abstract class H[A] { + type P <: R[P] + def a: P +} +class R[F] -- cgit v1.2.3