summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-09-27 10:20:55 -0700
committerPaul Phillips <paulp@improving.org>2012-09-27 12:06:05 -0700
commit690e4892297cb6bd1cfb1b6266036969f6aa17fe (patch)
tree8aab0a564f1e6923e7eafc32fbb50e24f9daa694 /src
parent75ffc821f711ecd4cad67cd13911f8e69952396f (diff)
downloadscala-690e4892297cb6bd1cfb1b6266036969f6aa17fe.tar.gz
scala-690e4892297cb6bd1cfb1b6266036969f6aa17fe.tar.bz2
scala-690e4892297cb6bd1cfb1b6266036969f6aa17fe.zip
Moved isNonRefinementClassType somewhere logical.
It's not Typer's personal method. All should be able to drink of its wisdom.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala6
-rw-r--r--src/reflect/scala/reflect/internal/Types.scala7
2 files changed, 7 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index e14dda9f12..15c1678dce 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -253,12 +253,6 @@ trait Typers extends Modes with Adaptations with Tags {
result
}
}
- def isNonRefinementClassType(tpe: Type) = tpe match {
- case SingleType(_, sym) => sym.isModuleClass
- case TypeRef(_, sym, _) => sym.isClass && !sym.isRefinementClass
- case ErrorType => true
- case _ => false
- }
private def errorNotClass(tpt: Tree, found: Type) = { ClassTypeRequiredError(tpt, found); false }
private def errorNotStable(tpt: Tree, found: Type) = { TypeNotAStablePrefixError(tpt, found); false }
diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala
index 4311f1dd4f..4607ced7c7 100644
--- a/src/reflect/scala/reflect/internal/Types.scala
+++ b/src/reflect/scala/reflect/internal/Types.scala
@@ -5722,6 +5722,13 @@ trait Types extends api.Types { self: SymbolTable =>
case _ => false
}
+ def isNonRefinementClassType(tpe: Type) = tpe match {
+ case SingleType(_, sym) => sym.isModuleClass
+ case TypeRef(_, sym, _) => sym.isClass && !sym.isRefinementClass
+ case ErrorType => true
+ case _ => false
+ }
+
// @assume tp1.isHigherKinded || tp2.isHigherKinded
def isHKSubType0(tp1: Type, tp2: Type, depth: Int): Boolean = (
tp1.typeSymbol == NothingClass