diff options
| author | Martin Odersky <odersky@gmail.com> | 2007-08-29 15:57:30 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2007-08-29 15:57:30 +0000 |
| commit | 10bd9e9c8ea541b22ed87319e04f957621b20de7 (patch) | |
| tree | 6a0fd9808d1259395a14fad4a9d162b668608ffd /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | 840202e705c9d13ee59515fde29543db81bcea9c (diff) | |
| download | scala-10bd9e9c8ea541b22ed87319e04f957621b20de7.tar.gz scala-10bd9e9c8ea541b22ed87319e04f957621b20de7.tar.bz2 scala-10bd9e9c8ea541b22ed87319e04f957621b20de7.zip | |
fix^2 of defect 15.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index b9a95c84db..3909b42ead 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -2601,7 +2601,7 @@ trait Typers { self: Analyzer => } } if (defSym.owner.isPackageClass) pre = defSym.owner.thisType - if (defSym.isThisSym) typed1(This(defSym.owner), mode, pt) + if (defSym.isThisSym) typed1(This(defSym.owner) setPos tree.pos, mode, pt) else { val tree1 = if (qual == EmptyTree) tree else atPos(tree.pos)(Select(qual, name)) @@ -2946,10 +2946,11 @@ trait Typers { self: Analyzer => if (tp1 eq tp0) tp else tp1 case _ => tp } +// Console.println("typing "+tree+" at "+tree.pos);//DEBUG var tree1 = if (tree.tpe ne null) tree else typed1(tree, mode, dropExistential(pt)) - //Console.println("typed "+tree1+":"+tree1.tpe+", "+context.undetparams);//DEBUG +// Console.println("typed "+tree1+":"+tree1.tpe+", "+context.undetparams);//DEBUG val result = if (tree1.isEmpty) tree1 else adapt(tree1, mode, pt) - //Console.println("adapted "+tree1+":"+tree1.tpe+" to "+pt+", "+context.undetparams);//DEBUG +// Console.println("adapted "+tree1+":"+tree1.tpe+" to "+pt+", "+context.undetparams);//DEBUG // if ((mode & TYPEmode) != 0) println("type: "+tree1+" has type "+tree1.tpe) result } catch { |