diff options
author | Martin Odersky <odersky@gmail.com> | 2005-11-21 16:44:00 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2005-11-21 16:44:00 +0000 |
commit | fb67524a831520da47ea29967d2595dced41c323 (patch) | |
tree | 042092bbe7669da3148710b959dde26cf0573ad3 | |
parent | b83bbad3113a93a2732021db27684c1fec4ba387 (diff) | |
download | scala-fb67524a831520da47ea29967d2595dced41c323.tar.gz scala-fb67524a831520da47ea29967d2595dced41c323.tar.bz2 scala-fb67524a831520da47ea29967d2595dced41c323.zip |
*** empty log message ***
-rwxr-xr-x | sources/scala/tools/nsc/symtab/Symbols.scala | 4 | ||||
-rwxr-xr-x | sources/scala/tools/nsc/symtab/Types.scala | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sources/scala/tools/nsc/symtab/Symbols.scala b/sources/scala/tools/nsc/symtab/Symbols.scala index c17af0d51f..cc8a907a02 100755 --- a/sources/scala/tools/nsc/symtab/Symbols.scala +++ b/sources/scala/tools/nsc/symtab/Symbols.scala @@ -914,10 +914,12 @@ import Flags._; thisTypePhase = phase; if (!(isValid(p) /*|| thisTypePhase != null && thisTypePhase.erasedTypes && phase.erasedTypes*/)) { - thisTypeCache = + thisTypeCache = ThisType(this) +/* if (isModuleClass && !isRoot && !phase.erasedTypes) singleType(owner.thisType, sourceModule); else ThisType(this); +*/ } } thisTypeCache diff --git a/sources/scala/tools/nsc/symtab/Types.scala b/sources/scala/tools/nsc/symtab/Types.scala index 0748802f29..3faa808ee3 100755 --- a/sources/scala/tools/nsc/symtab/Types.scala +++ b/sources/scala/tools/nsc/symtab/Types.scala @@ -480,7 +480,7 @@ import Flags._; /** A class for this-types of the form <sym>.this.type */ abstract case class ThisType(sym: Symbol) extends SingletonType { - assert(sym.isClass && !sym.isModuleClass || sym.isRoot, sym); + //assert(sym.isClass && !sym.isModuleClass || sym.isRoot, sym); override def isTrivial: boolean = sym.isPackageClass; override def symbol = sym; override def singleDeref: Type = sym.typeOfThis; |