diff options
| author | michelou <michelou@epfl.ch> | 2007-12-19 12:07:24 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-12-19 12:07:24 +0000 |
| commit | 7d3efa0e191d805d171961b26baab773669b2b69 (patch) | |
| tree | b6ba36cc9bab747fb025954d258c7e66d5c7dbf4 | |
| parent | 74dc1a845361a7cbfac93e1936f6487e9ae69283 (diff) | |
| download | scala-7d3efa0e191d805d171961b26baab773669b2b69.tar.gz scala-7d3efa0e191d805d171961b26baab773669b2b69.tar.bz2 scala-7d3efa0e191d805d171961b26baab773669b2b69.zip | |
added type param to Class
| -rw-r--r-- | lib/scala-compiler.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | test/files/jvm/typerep.scala | 7 | ||||
| -rw-r--r-- | test/files/pos/bug1107.scala | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1 index d94d5aed1b..20b6d0396f 100644 --- a/lib/scala-compiler.jar.desired.sha1 +++ b/lib/scala-compiler.jar.desired.sha1 @@ -1 +1 @@ -5ca5f465ee0cf5e17e2f51b256a7fe813d5be005 ?scala-compiler.jar +89ceb76a10d98baef63a75a90038c0a15b84bcc3 ?scala-compiler.jar diff --git a/test/files/jvm/typerep.scala b/test/files/jvm/typerep.scala index 3b06a8d8a3..f0aac8e935 100644 --- a/test/files/jvm/typerep.scala +++ b/test/files/jvm/typerep.scala @@ -172,8 +172,9 @@ object TypeRep { implicit def floatRep: TypeRep[Float] = FloatRep implicit def doubleRep: TypeRep[Double] = DoubleRep + type AnyClass = Class[_] implicit def unitRep: TypeRep[Unit] = UnitRep - implicit def classRep: TypeRep[Class] = ClassRep + implicit def classRep: TypeRep[AnyClass] = ClassRep implicit def stringRep: TypeRep[String] = StringRep implicit def noneRep: TypeRep[Option[Nothing]] = NoneRep[Nothing](NothingRep.asInstanceOf[TypeRep[Nothing]]) implicit def anyRep: TypeRep[Any] = AnyRep @@ -224,7 +225,7 @@ object TypeRep { implicit def func9Rep[A1, A2, A3, A4, A5, A6, A7, A8, A9, B](implicit a1: TypeRep[A1], a2: TypeRep[A2], a3: TypeRep[A3], a4: TypeRep[A4], a5: TypeRep[A5], a6: TypeRep[A6], a7: TypeRep[A7], a8: TypeRep[A8], a9: TypeRep[A9], b: TypeRep[B]): TypeRep[Function9[A1, A2, A3, A4, A5, A6, A7, A8, A9, B]] = Function9Rep(a1, a2, a3, a4, a5, a6, a7, a8, a9, b) /* - implicit def objectRep[A <: AnyRef](obj: A)(implicit rep: TypeRep[A]): TypeRep[Class] = + implicit def objectRep[A <: AnyRef](obj: A)(implicit rep: TypeRep[A]): TypeRep[AnyClass] = ObjectRep(obj.getClass) */ @@ -256,7 +257,7 @@ object TypeRep { case object UnitRep extends TypeRep[Unit] { override def toString = "Unit" } - case object ClassRep extends TypeRep[Class] { + case object ClassRep extends TypeRep[AnyClass] { override def toString = "Class" } case object StringRep extends TypeRep[String] { diff --git a/test/files/pos/bug1107.scala b/test/files/pos/bug1107.scala index d3cdbf65cc..0bf40bb4cc 100644 --- a/test/files/pos/bug1107.scala +++ b/test/files/pos/bug1107.scala @@ -1,5 +1,6 @@ object F { - def tryf[T](ignore: List[Class])(f: => T): Any = { + type AnyClass = Class[_] + def tryf[T](ignore: List[AnyClass])(f: => T): Any = { try { f } catch { |