summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-02-11 09:34:50 +0000
committerPaul Phillips <paulp@improving.org>2011-02-11 09:34:50 +0000
commit7b7d17757177579319d2efa1fd94cea218ad8780 (patch)
tree111fd577d9a0e17c1c5cb7eee6eb8066d180a8d3 /src
parente9f1ccb0308f207303af2507415379c4d8dbcd6a (diff)
downloadscala-7b7d17757177579319d2efa1fd94cea218ad8780.tar.gz
scala-7b7d17757177579319d2efa1fd94cea218ad8780.tar.bz2
scala-7b7d17757177579319d2efa1fd94cea218ad8780.zip
Fix for #4188.
It seems to arise from the changes to inner objects which make them look like lazy vals. I am not sure this is the right change but at least it's only about a six character diff to review. Closes #4188, review by odersky.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/matching/ParallelMatching.scala2
-rw-r--r--src/compiler/scala/tools/nsc/symtab/TypeDebugging.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
index 007c74dc3c..89e849d038 100644
--- a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
+++ b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
@@ -878,7 +878,7 @@ trait ParallelMatching extends ast.TreeDSL
case ConstantType(Constant(null)) if isRef => scrutTree OBJ_EQ NULL
case ConstantType(Constant(value)) => scrutTree MEMBER_== Literal(value)
case SingleType(NoPrefix, sym) => genEquals(sym)
- case SingleType(pre, sym) if sym.isModule => genEquals(sym)
+ case SingleType(pre, sym) if sym.isStable => genEquals(sym)
case ThisType(sym) if sym.isModule => genEquals(sym)
case _ if isMatchUnlessNull => scrutTree OBJ_NE NULL
case _ => scrutTree IS tpe
diff --git a/src/compiler/scala/tools/nsc/symtab/TypeDebugging.scala b/src/compiler/scala/tools/nsc/symtab/TypeDebugging.scala
index 12e10879bd..5ed7344bd8 100644
--- a/src/compiler/scala/tools/nsc/symtab/TypeDebugging.scala
+++ b/src/compiler/scala/tools/nsc/symtab/TypeDebugging.scala
@@ -21,7 +21,7 @@ trait TypeDebugging {
}
def dump(tp: Type): Unit = {
- println("** " + tp + " **")
+ println("** " + tp + " / " + tp.getClass + " **")
import tp._
println("typeSymbol = " + typeSymbol)