aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/SymDenotations.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2013-04-06 12:23:58 +0200
committerMartin Odersky <odersky@gmail.com>2013-04-06 12:26:45 +0200
commitde1684b2daa4e23ff825965f4956e65410917a71 (patch)
tree39dd3194492f964f5484de124aa7e4576bbc155e /src/dotty/tools/dotc/core/SymDenotations.scala
parent7ff269e8027d1aeddfec4eb0ada7a565fcd11c1f (diff)
downloaddotty-de1684b2daa4e23ff825965f4956e65410917a71.tar.gz
dotty-de1684b2daa4e23ff825965f4956e65410917a71.tar.bz2
dotty-de1684b2daa4e23ff825965f4956e65410917a71.zip
Renamings
module => sourceModule in class ClassCompleter LazyModuleInfo => ModuleCompleter
Diffstat (limited to 'src/dotty/tools/dotc/core/SymDenotations.scala')
-rw-r--r--src/dotty/tools/dotc/core/SymDenotations.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala
index c6d90737d..c019d94e0 100644
--- a/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -422,7 +422,7 @@ object SymDenotations {
/** The class implementing this module, NoSymbol if not applicable. */
final def moduleClass: Symbol = _info match {
case info: TypeRefBySym if this is ModuleVal => info.fixedSym
- case info: LazyModuleInfo => info.mclass
+ case info: ModuleCompleter => info.mclass
case _ => NoSymbol
}
@@ -431,7 +431,7 @@ object SymDenotations {
case ClassInfo(_, _, _, _, selfType: TermRefBySym) if this is ModuleClass =>
selfType.fixedSym
case info: ClassCompleter =>
- info.module
+ info.sourceModule
case _ =>
NoSymbol
}
@@ -982,12 +982,12 @@ object SymDenotations {
class ClassCompleter(val decls: Scope, underlying: LazyType = NoCompleter)
extends LazyType {
def complete(denot: SymDenotation): Unit = underlying.complete(denot)
- def module: Symbol = NoSymbol
+ def sourceModule: Symbol = NoSymbol
}
- class ModuleClassCompleter(modul: Symbol, underlying: LazyType = NoCompleter)
+ class ModuleClassCompleter(module: Symbol, underlying: LazyType = NoCompleter)
extends ClassCompleter(newScope, underlying) {
- override def module = modul
+ override def sourceModule = module
}
object NoCompleter extends LazyType {
@@ -999,7 +999,7 @@ object SymDenotations {
* Completion of modules is always completion of the underlying
* module class, followed by copying the relevant fields to the module.
*/
- class LazyModuleInfo(val mclass: ClassSymbol)(implicit cctx: CondensedContext) extends LazyType {
+ class ModuleCompleter(val mclass: ClassSymbol)(implicit cctx: CondensedContext) extends LazyType {
def complete(denot: SymDenotation): Unit = {
val from = denot.moduleClass.denot.asClass
denot.setFlag(from.flags.toTermFlags & RetainedModuleValFlags)