summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2010-06-06 07:54:20 +0000
committerMartin Odersky <odersky@gmail.com>2010-06-06 07:54:20 +0000
commitfd0c5bec31eec3a3b353668b20c4d9b06fb69ff4 (patch)
treec53ace364f002e710aa9d2cfa9b98f82676583b8
parent85776e68d0b8bb1c1c377e9a7391c0c6fd2276fa (diff)
downloadscala-fd0c5bec31eec3a3b353668b20c4d9b06fb69ff4.tar.gz
scala-fd0c5bec31eec3a3b353668b20c4d9b06fb69ff4.tar.bz2
scala-fd0c5bec31eec3a3b353668b20c4d9b06fb69ff4.zip
Applied constant folder patch from r 22175
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala b/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala
index ac1853cbe0..5e11cf7bb6 100644
--- a/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala
@@ -33,7 +33,7 @@ abstract class ConstantFolder {
* @param tree ...
* @param pt ...
*/
- def apply(tree: Tree, pt: Type): Tree = fold(tree, tree.tpe match {
+ def apply(tree: Tree, pt: Type): Tree = fold(apply(tree), tree.tpe match {
case ConstantType(x) => x convertTo pt
case _ => null
})