Fixed bug1049

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@12315 5e8d7ff9-d8ef-0310-90f0-a4852d11357a

src/compiler/scala/tools/nsc/ast/TreePrinters.scala

@@ -204,7 +204,9 @@ abstract class TreePrinters {
             if (self.name != nme.WILDCARD) {
               print(" { "); print(self.name); printOpt(": ", self.tpt); print(" => ") 
             } else if (!self.tpt.isEmpty) {
-              print(" _ : "); print(self.tpt); print(" => ") 
+              print(" { _ : "); print(self.tpt); print(" => ") 
+            } else {
+              print(" {")
             }
             printColumn(body, "", ";", "}")
           }

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)
       }
     }