implements reification of tough types

3 files changed, 62 insertions, 58 deletions

diff --git a/test/files/jvm/manifests.check b/test/files/jvm/manifests.check
new file mode 100644
index 0000000000..be8ec2bb5b
--- /dev/null
+++ b/test/files/jvm/manifests.check
@@ -0,0 +1,56 @@
+x=(), m=ConcreteTypeTag[Unit], k=TypeRef, s=class Unit

+x=true, m=ConcreteTypeTag[Boolean], k=TypeRef, s=class Boolean

+x=a, m=ConcreteTypeTag[Char], k=TypeRef, s=class Char

+x=1, m=ConcreteTypeTag[Int], k=TypeRef, s=class Int

+x=abc, m=ConcreteTypeTag[String], k=TypeRef, s=class String

+x='abc, m=ConcreteTypeTag[Symbol], k=TypeRef, s=class Symbol

+

+x=List(()), m=ConcreteTypeTag[List[Unit]], k=TypeRef, s=class List

+x=List(true), m=ConcreteTypeTag[List[Boolean]], k=TypeRef, s=class List

+x=List(1), m=ConcreteTypeTag[List[Int]], k=TypeRef, s=class List

+x=List(abc), m=ConcreteTypeTag[List[String]], k=TypeRef, s=class List

+x=List('abc), m=ConcreteTypeTag[List[Symbol]], k=TypeRef, s=class List

+

+x=[Z, m=ConcreteTypeTag[Array[Boolean]], k=TypeRef, s=class Array

+x=[C, m=ConcreteTypeTag[Array[Char]], k=TypeRef, s=class Array

+x=[I, m=ConcreteTypeTag[Array[Int]], k=TypeRef, s=class Array

+x=[Ljava.lang.String;, m=ConcreteTypeTag[Array[String]], k=TypeRef, s=class Array

+x=[Lscala.Symbol;, m=ConcreteTypeTag[Array[Symbol]], k=TypeRef, s=class Array

+

+x=((),()), m=ConcreteTypeTag[(Unit, Unit)], k=TypeRef, s=class Tuple2

+x=(true,false), m=ConcreteTypeTag[(Boolean, Boolean)], k=TypeRef, s=class Tuple2

+x=(1,2), m=ConcreteTypeTag[(Int, Int)], k=TypeRef, s=class Tuple2

+x=(abc,xyz), m=ConcreteTypeTag[(String, String)], k=TypeRef, s=class Tuple2

+x=('abc,'xyz), m=ConcreteTypeTag[(Symbol, Symbol)], k=TypeRef, s=class Tuple2

+

+

+x=Foo, m=ConcreteTypeTag[Foo[Int]], k=TypeRef, s=class Foo

+x=Foo, m=ConcreteTypeTag[Foo[List[Int]]], k=TypeRef, s=class Foo

+x=Foo, m=ConcreteTypeTag[Foo[Foo[Int]]], k=TypeRef, s=class Foo

+x=Foo, m=ConcreteTypeTag[Foo[List[Foo[Int]]]], k=TypeRef, s=class Foo

+

+x=Test1$$anon$1, m=ConcreteTypeTag[Bar[String]], k=RefinedType, s=<local Test1>

+x=Test1$$anon$2, m=ConcreteTypeTag[Bar[String]], k=RefinedType, s=<local Test1>

+

+()=()

+true=true

+a=a

+1=1

+'abc='abc

+

+List(())=List(())

+List(true)=List(true)

+List('abc)=List('abc)

+

+Array()=Array()

+Array(true)=Array(true)

+Array(a)=Array(a)

+Array(1)=Array(1)

+

+((),())=((),())

+(true,false)=(true,false)

+

+List(List(1), List(2))=List(List(1), List(2))

+

+Array(Array(1), Array(2))=Array(Array(1), Array(2))

+

diff --git a/test/files/jvm/manifests.check.temporarily.disabled b/test/files/jvm/manifests.check.temporarily.disabled
deleted file mode 100644
index 54f504b929..0000000000
--- a/test/files/jvm/manifests.check.temporarily.disabled
+++ /dev/null
@@ -1,55 +0,0 @@
-x=(), m=Unit
-x=true, m=Boolean
-x=a, m=Char
-x=1, m=Int
-x=abc, m=java.lang.String
-x='abc, m=scala.Symbol
-
-x=List(()), m=scala.collection.immutable.List[Unit]
-x=List(true), m=scala.collection.immutable.List[Boolean]
-x=List(1), m=scala.collection.immutable.List[Int]
-x=List(abc), m=scala.collection.immutable.List[java.lang.String]
-x=List('abc), m=scala.collection.immutable.List[scala.Symbol]
-
-x=[Z, m=Array[Boolean]
-x=[C, m=Array[Char]
-x=[I, m=Array[Int]
-x=[Ljava.lang.String;, m=Array[java.lang.String]
-x=[Lscala.Symbol;, m=Array[scala.Symbol]
-
-x=((),()), m=scala.Tuple2[Unit, Unit]
-x=(true,false), m=scala.Tuple2[Boolean, Boolean]
-x=(1,2), m=scala.Tuple2[Int, Int]
-x=(abc,xyz), m=scala.Tuple2[java.lang.String, java.lang.String]
-x=('abc,'xyz), m=scala.Tuple2[scala.Symbol, scala.Symbol]
-
-
-x=Foo, m=Foo[Int]
-x=Foo, m=Foo[scala.collection.immutable.List[Int]]
-x=Foo, m=Foo[Foo[Int]]
-x=Foo, m=Foo[scala.collection.immutable.List[Foo[Int]]]
-
-x=Test1$$anon$1, m=Object with Bar[java.lang.String]
-
-()=()
-true=true
-a=a
-1=1
-'abc='abc
-
-List(())=List(())
-List(true)=List(true)
-List('abc)=List('abc)
-
-Array()=Array()
-Array(true)=Array(true)
-Array(a)=Array(a)
-Array(1)=Array(1)
-
-((),())=((),())
-(true,false)=(true,false)
-
-List(List(1), List(2))=List(List(1), List(2))
-
-Array(Array(1), Array(2))=Array(Array(1), Array(2))
-
diff --git a/test/files/jvm/manifests.scala.temporarily.disabled b/test/files/jvm/manifests.scala
index 241966fd9d..935427f5d4 100644
--- a/test/files/jvm/manifests.scala.temporarily.disabled
+++ b/test/files/jvm/manifests.scala
@@ -50,7 +50,8 @@ object Test1 extends TestUtil {
   print(new Foo(List(new Foo(2))))
   println()
 
-  print(new Bar[String] { def f = "abc" })
+  print(new Bar[String] { def f = "abc" });
+  {print(new Bar[String] { def f = "abc" })}
   println()
 }
 
@@ -102,8 +103,10 @@ trait TestUtil {
   }
   import scala.reflect._
   def print[T](x: T)(implicit m: Manifest[T]) {
-    val m1: Manifest[T] = read(write(m))
+    // manifests are no longer serializable
+//    val m1: Manifest[T] = read(write(m))
+    val m1: Manifest[T] = m
     val x1 = x.toString.replaceAll("@[0-9a-z]+$", "")
-    println("x="+x1+", m="+m1)
+    println("x="+x1+", m="+m1+", k="+m1.tpe.kind+", s="+m1.sym.toString)
   }
 }