diff options
| author | Burak Emir <emir@epfl.ch> | 2007-08-07 15:55:25 +0000 |
|---|---|---|
| committer | Burak Emir <emir@epfl.ch> | 2007-08-07 15:55:25 +0000 |
| commit | e822b909c27723848acfc68207e33a3d0e95f8ce (patch) | |
| tree | 51cf39a14adcdcf9dc404428f5950ad4d270601d /src | |
| parent | 09db2edcd97040de2e5e77d645633023b3ad5fbf (diff) | |
| download | scala-e822b909c27723848acfc68207e33a3d0e95f8ce.tar.gz scala-e822b909c27723848acfc68207e33a3d0e95f8ce.tar.bz2 scala-e822b909c27723848acfc68207e33a3d0e95f8ce.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/matching/ParallelMatching.scala | 6 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/matching/PatternMatchers.scala | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala index 454ae2f3a7..1439a52614 100644 --- a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala +++ b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala @@ -424,7 +424,7 @@ trait ParallelMatching { case _ => column.head.tpe } private val isCaseHead = isCaseClass(patternType) - private val dummies = if(!isCaseHead) Nil else patternType./*?type?*/symbol.caseFieldAccessors.map { x => EmptyTree } + private val dummies = if(!isCaseHead) Nil else patternType.typeSymbol.caseFieldAccessors.map { x => EmptyTree } //Console.println("isCaseHead = "+isCaseHead) //Console.println("dummies = "+dummies) @@ -1169,10 +1169,10 @@ object Rep { } else if (scrutineeTree.tpe <:< tpe && tpe <:< definitions.AnyRefClass.tpe) { //if(scrutineeTree.symbol.hasFlag(symtab.Flags.SYNTHETIC)) Literal(Constant(true)) else NotNull(scrutineeTree) - } else if(tpe.prefix./*?term?*/symbol.isTerm && tpe./*?type?*/symbol.linkedModuleOfClass != NoSymbol) { // object + } else if(tpe.termSymbol.isModule) { // object //Console.println("iT"+tpe.prefix.symbol.isTerm) //Console.println("lmoc"+tpe./*?type?*/symbol.linkedModuleOfClass) - Eq(gen.mkAttributedRef(tpe.prefix, tpe./*?type?*/symbol.linkedModuleOfClass), scrutineeTree) + Eq(gen.mkAttributedRef(tpe.prefix, tpe.termSymbol), scrutineeTree) } else //Console.println(tpe.prefix.symbol.isTerm) //Console.println(tpe./*?type?*/symbol) diff --git a/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala b/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala index 613880f004..616733508d 100644 --- a/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala +++ b/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala @@ -1304,7 +1304,7 @@ print() case VariablePat(tree) => // objects are compared by eq, not == - val cmp = if (tree.tpe./*?type?*/symbol.isModuleClass && selector.tpe <:< defs.AnyRefClass.tpe) + val cmp = if (tree.tpe.termSymbol.isModule && selector.tpe <:< defs.AnyRefClass.tpe) Eq(selector.duplicate, tree) else Equals(selector.duplicate, tree) |