diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-14 12:26:38 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-14 12:26:38 -0700 |
| commit | 5b562d4e7e451156236b48b3591db980a5691f8d (patch) | |
| tree | 3124bf445563990531abd2b68be6750a99c1162c /src | |
| parent | 55990c9ec619cf212a31db4f818dedb5d3150157 (diff) | |
| download | scala-5b562d4e7e451156236b48b3591db980a5691f8d.tar.gz scala-5b562d4e7e451156236b48b3591db980a5691f8d.tar.bz2 scala-5b562d4e7e451156236b48b3591db980a5691f8d.zip | |
Cleaning up stray ScalaObject references.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/reflect/internal/Types.scala | 8 | ||||
| -rw-r--r-- | src/detach/plugin/scala/tools/detach/Detach.scala | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala index 94559aeacd..ac4f404521 100644 --- a/src/compiler/scala/reflect/internal/Types.scala +++ b/src/compiler/scala/reflect/internal/Types.scala @@ -5879,14 +5879,6 @@ trait Types extends api.Types { self: SymbolTable => loop(initialBTSes) } - // @AM the following problem is solved by elimHOTparams in lublist - // @PP lubLists gone bad: lubList(List( - // List(scala.collection.generic.GenericCompanion[scala.collection.immutable.Seq], ScalaObject, java.lang.Object, Any) - // List(scala.collection.generic.GenericCompanion[scala.collection.mutable.Seq], ScalaObject, java.lang.Object, Any) - // )) == ( - // List(scala.collection.generic.GenericCompanion[Seq**[Any]**], ScalaObject, java.lang.Object, Any) - // ) - /** The minimal symbol (wrt Symbol.isLess) of a list of types */ private def minSym(tps: List[Type]): Symbol = (tps.head.typeSymbol /: tps.tail) { diff --git a/src/detach/plugin/scala/tools/detach/Detach.scala b/src/detach/plugin/scala/tools/detach/Detach.scala index 546041844e..41a3795a49 100644 --- a/src/detach/plugin/scala/tools/detach/Detach.scala +++ b/src/detach/plugin/scala/tools/detach/Detach.scala @@ -746,8 +746,7 @@ abstract class Detach extends PluginComponent // Variant 1: rebind/unbind val cparents = List(UnicastRemoteObjectClass.tpe, iface.tpe, UnreferencedClass.tpe) // Variant 2: un-/exportObject - //val cparents = List(ObjectClass.tpe, iface.tpe, - // UnreferencedClass.tpe, ScalaObjectClass.tpe) + //val cparents = List(ObjectClass.tpe, iface.tpe, UnreferencedClass.tpe) iclaz setInfo ClassInfoType(cparents, newScope, iclaz) val proxy = (iface, iclaz, new mutable.HashMap[Symbol, Symbol]) proxies(clazz) = proxy |