summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBurak Emir <emir@epfl.ch>2007-07-07 22:30:02 +0000
committerBurak Emir <emir@epfl.ch>2007-07-07 22:30:02 +0000
commitee232043b0754882f4f865061ea51393edd7df11 (patch)
tree5e1f99c9e888f477daeeaaf7a111b4a832c6144b
parent32cd1ac7b8ddcc81442f33c6d721ad0122c25d90 (diff)
downloadscala-ee232043b0754882f4f865061ea51393edd7df11.tar.gz
scala-ee232043b0754882f4f865061ea51393edd7df11.tar.bz2
scala-ee232043b0754882f4f865061ea51393edd7df11.zip
fixing condition
-rw-r--r--src/compiler/scala/tools/nsc/matching/ParallelMatching.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
index 72531b4fcf..be0e9108ea 100644
--- a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
+++ b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
@@ -87,7 +87,7 @@ trait ParallelMatching {
if(settings_debug) { Console.println("MixLiteral") }
return new MixLiterals(scrutinee, column, rest)
}
- if(false && (column.length > 1) && isFlatCases(column)) {
+ if((column.length > 1) && isFlatCases(column)) {
if(settings_debug) {
Console.println("flat cases!"+column)
Console.println(scrutinee.tpe.symbol.children)
@@ -1053,7 +1053,8 @@ object Rep {
else
Equals(scrutineeTree, Literal(value)) // constant
} else if(scrutineeTree.tpe <:< tpe && tpe <:< definitions.AnyRefClass.tpe) {
- if(scrutineeTree.symbol.hasFlag(symtab.Flags.SYNTHETIC)) Literal(Constant(true)) else NotNull(scrutineeTree)
+ //if(scrutineeTree.symbol.hasFlag(symtab.Flags.SYNTHETIC)) Literal(Constant(true)) else
+ NotNull(scrutineeTree)
} else if(tpe.prefix.symbol.isTerm && tpe.symbol.linkedModuleOfClass != NoSymbol) { // object
//Console.println("iT"+tpe.prefix.symbol.isTerm)
//Console.println("lmoc"+tpe.symbol.linkedModuleOfClass)