summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Namers.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2007-07-14 11:51:42 +0000
committerMartin Odersky <odersky@gmail.com>2007-07-14 11:51:42 +0000
commit8a5b14e856a7c3944c2a47fd430c836fefdf5fb4 (patch)
tree3e765b04c85d286dd830d7b8904f2c3ee96c9904 /src/compiler/scala/tools/nsc/typechecker/Namers.scala
parent5c473c90d8e4eb324417e251569d2deac5ba896e (diff)
downloadscala-8a5b14e856a7c3944c2a47fd430c836fefdf5fb4.tar.gz
scala-8a5b14e856a7c3944c2a47fd430c836fefdf5fb4.tar.bz2
scala-8a5b14e856a7c3944c2a47fd430c836fefdf5fb4.zip
Fixed bug1049
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Namers.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index 6d9c1f1a4d..79fa6571b5 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -392,7 +392,9 @@ trait Namers { self: Analyzer =>
def selfTypeCompleter(tree: Tree) = new TypeCompleter(tree) {
override def complete(sym: Symbol) {
- sym.setInfo(typer.typedType(tree).tpe)
+ var selftpe = glb(List(typer.typedType(tree).tpe, sym.owner.tpe))
+// println("completing self of "+sym.owner+": "+selftpe)
+ sym.setInfo(selftpe)
}
}