diff options
| author | Paul Phillips <paulp@improving.org> | 2010-12-03 23:53:58 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-12-03 23:53:58 +0000 |
| commit | 9e9914e109c91cd4f86802129c236827517d8386 (patch) | |
| tree | 7cb656bc2b54f13e53b2d55db59c10c418296c77 /src/compiler/scala/tools/nsc/typechecker/Contexts.scala | |
| parent | e1a0866ce748ee1a228060f401dbb190d3caa8c3 (diff) | |
| download | scala-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/Contexts.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index f5033dc58c..eb96a6fba6 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -48,7 +48,7 @@ trait Contexts { self: Analyzer => assert(ScalaPackage ne null, "Scala package is null") imps += ScalaPackage if (!(treeInfo.isUnitInScala(unit.body, nme.Predef) || - treeInfo.isUnitInScala(unit.body, nme.ScalaObject) || + treeInfo.isUnitInScala(unit.body, tpnme.ScalaObject) || treeInfo.containsLeadingPredefImport(List(unit.body)))) imps += PredefModule } |