summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2004-03-26 13:57:29 +0000
committerMartin Odersky <odersky@gmail.com>2004-03-26 13:57:29 +0000
commitb9295636593fc7e200a70fa46af25eb60782090f (patch)
treecbd4b494fe2a7b77fecd9e8dc821db2906615070
parentc44e8bb3c3a24709f2e137392aa4eab6f0f4ed59 (diff)
downloadscala-b9295636593fc7e200a70fa46af25eb60782090f.tar.gz
scala-b9295636593fc7e200a70fa46af25eb60782090f.tar.bz2
scala-b9295636593fc7e200a70fa46af25eb60782090f.zip
*** empty log message ***
-rw-r--r--sources/scala/tools/scalac/typechecker/Context.scala2
-rw-r--r--sources/scala/tools/scalac/typechecker/Infer.scala3
2 files changed, 3 insertions, 2 deletions
diff --git a/sources/scala/tools/scalac/typechecker/Context.scala b/sources/scala/tools/scalac/typechecker/Context.scala
index f37b21ee2e..58eb148ba7 100644
--- a/sources/scala/tools/scalac/typechecker/Context.scala
+++ b/sources/scala/tools/scalac/typechecker/Context.scala
@@ -84,7 +84,7 @@ class Context {
*/
if (viewCache.forall(v => v.sym != sym)) {
val v = View(sym, symtype, qual, this);
- System.out.println("VIEW " + sym + ":" + symtype + " " + qual);//debug
+ //System.out.println("VIEW " + sym + ":" + symtype + " " + qual);//
viewCache = v :: viewCache;//.filter(isUnShadowed);
}
}
diff --git a/sources/scala/tools/scalac/typechecker/Infer.scala b/sources/scala/tools/scalac/typechecker/Infer.scala
index 38621cab7a..dde89e51be 100644
--- a/sources/scala/tools/scalac/typechecker/Infer.scala
+++ b/sources/scala/tools/scalac/typechecker/Infer.scala
@@ -71,7 +71,8 @@ class Infer(global: scalac_Global, gen: TreeGen, make: TreeFactory) extends scal
case _ =>
}
if (obj.isModule()) {
- val qual = gen.mkRef(Position.NOPOS, tp.prefix(), obj);
+ val qual = if (tp.prefix() == Type.NoType) Tree.Empty
+ else gen.mkRef(Position.NOPOS, tp.prefix(), obj);
val viewsym = obj.info().lookupNonPrivate(Names.view);
if (viewsym.kind == VAL) {
obj.getType().memberType(viewsym) match {