summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2007-07-20 09:03:20 +0000
committerAdriaan Moors <adriaan.moors@epfl.ch>2007-07-20 09:03:20 +0000
commitd33a20f0677ca77490bfc40486f0f2c72f14a21d (patch)
treee0e3da80cfe0abb1d95afe32d57591b8dc150002 /src
parent1adb565b6e22550d72bf99fb7a527034ed770629 (diff)
downloadscala-d33a20f0677ca77490bfc40486f0f2c72f14a21d.tar.gz
scala-d33a20f0677ca77490bfc40486f0f2c72f14a21d.tar.bz2
scala-d33a20f0677ca77490bfc40486f0f2c72f14a21d.zip
classOf[Integer] now properly resolves to class...
classOf[Integer] now properly resolves to classOf[java.lang.Integer] because Predef.Integer (and Character) are @deprecated, had to update check files to include these warnings
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 7669b1eb52..6370eb244d 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -2070,7 +2070,7 @@ trait Typers { self: Analyzer =>
if (fun.symbol == Predef_classOf) {
if (!targs.head.typeSymbol.isClass || targs.head.typeSymbol.isRefinementClass)
error(args.head.pos, "class type required");
- Literal(Constant(targs.head)) setPos tree.pos setType ClassClass.tpe
+ Literal(Constant(targs.head.normalize)) setPos tree.pos setType ClassClass.tpe
} else {
val resultpe0 = restpe.instantiateTypeParams(tparams, targs)
//@M TODO -- probably ok