diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-01-15 15:01:54 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-01-15 15:06:20 -0800 |
commit | a6b34b60feaea763fd5a056eb55f25aa1f57988a (patch) | |
tree | f26c8fa7a2a528f375cd403955b9358ad29fd0c1 /src | |
parent | 621f7a56c21686ebbd39b8ffe9282f917fe1f128 (diff) | |
download | scala-a6b34b60feaea763fd5a056eb55f25aa1f57988a.tar.gz scala-a6b34b60feaea763fd5a056eb55f25aa1f57988a.tar.bz2 scala-a6b34b60feaea763fd5a056eb55f25aa1f57988a.zip |
SI-6956 determine switchability by type, not tree
Constant folding will set the type of a constant tree
to `ConstantType(Constant(folded))`, while the tree
itself can be many different things (in casu, an Ident).
We used to look at the tree directly when deciding whether
to emit a switch. Now we look at the tree's type. VoilĂ .
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala index d8cfd5a765..454d9210ff 100644 --- a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala +++ b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala @@ -3494,8 +3494,10 @@ trait PatternMatching extends Transform with TypingTransformers with ast.TreeDSL val alternativesSupported = true val canJump = true - object SwitchablePattern { def unapply(pat: Tree): Option[Tree] = pat match { - case Literal(const@Constant((_: Byte ) | (_: Short) | (_: Int ) | (_: Char ))) => + // Constant folding sets the type of a constant tree to `ConstantType(Constant(folded))` + // The tree itself can be a literal, an ident, a selection, ... + object SwitchablePattern { def unapply(pat: Tree): Option[Tree] = pat.tpe match { + case ConstantType(const@Constant((_: Byte ) | (_: Short) | (_: Int ) | (_: Char ))) => Some(Literal(Constant(const.intValue))) // TODO: Java 7 allows strings in switches case _ => None }} |