summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Typers.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-12-03 23:53:58 +0000
committerPaul Phillips <paulp@improving.org>2010-12-03 23:53:58 +0000
commit9e9914e109c91cd4f86802129c236827517d8386 (patch)
tree7cb656bc2b54f13e53b2d55db59c10c418296c77 /src/compiler/scala/tools/nsc/typechecker/Typers.scala
parente1a0866ce748ee1a228060f401dbb190d3caa8c3 (diff)
downloadscala-9e9914e109c91cd4f86802129c236827517d8386.tar.gz
scala-9e9914e109c91cd4f86802129c236827517d8386.tar.bz2
scala-9e9914e109c91cd4f86802129c236827517d8386.zip
Starting the mopping up now that names have som...
Starting the mopping up now that names have some more sense of their place in the universe. Cleaned up some heavy multi-boolean logic. Added more documentation on the relationships between entities in Symbols and some other compiler things which often blur together. Fun fact: the incorrect usage of nme.ScalaObject in Contexts which I reported when first broaching the namespace subject became a compile time error during the writing of this patch, because there is no longer any such thing as nme.ScalaObject. It's a little bit like magic. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 752931388d..65ce41c020 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1780,8 +1780,7 @@ trait Typers { self: Analyzer =>
if (!meth.isPrimaryConstructor &&
(!meth.owner.isClass ||
meth.owner.isModuleClass ||
- meth.owner.isAnonymousClass ||
- meth.owner.isRefinementClass))
+ meth.owner.isAnonOrRefinementClass))
error(ddef.pos, "constructor definition not allowed here")
typed(ddef.rhs)
} else {