diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-01-11 19:01:09 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-03-24 14:59:26 +1000 |
commit | 3d9d1f6c99d2ee803402b02cccba72086af74b38 (patch) | |
tree | 852b76b3a707cd7e55689863f4e23d2a9dac6795 /src/interactive/scala/tools/nsc | |
parent | e6e5b146f19ac7bebf046a4bc0cbc0b8ce88a3a1 (diff) | |
download | scala-3d9d1f6c99d2ee803402b02cccba72086af74b38.tar.gz scala-3d9d1f6c99d2ee803402b02cccba72086af74b38.tar.bz2 scala-3d9d1f6c99d2ee803402b02cccba72086af74b38.zip |
SI-9074 Fix generic substitution with package objects, overloading
Takes a leaf out of dotty's book [1] and makes `asSeenFrom`
transparently change the prefix from the package class to the
package object when needed.
This fixes generic subsitution during overload resolution, as
reported in SI-9074.
This subsumes the former fix for SI-6225, which is removed here.
[1] https://github.com/lampepfl/dotty/pull/282
Diffstat (limited to 'src/interactive/scala/tools/nsc')
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Global.scala | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala index a192dd3738..3f963730f1 100644 --- a/src/interactive/scala/tools/nsc/interactive/Global.scala +++ b/src/interactive/scala/tools/nsc/interactive/Global.scala @@ -159,18 +159,6 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") override def forInteractive = true override protected def synchronizeNames = true - override def newAsSeenFromMap(pre: Type, clazz: Symbol): AsSeenFromMap = - new InteractiveAsSeenFromMap(pre, clazz) - - class InteractiveAsSeenFromMap(pre: Type, clazz: Symbol) extends AsSeenFromMap(pre, clazz) { - /** The method formerly known as 'instParamsRelaxed' goes here if it's still necessary, - * which it is currently supposed it is not. - * - * If it is, change AsSeenFromMap method correspondingTypeArgument to call an overridable - * method rather than aborting in the failure case. - */ - } - /** A map of all loaded files to the rich compilation units that correspond to them. */ val unitOfFile = mapAsScalaMapConverter(new ConcurrentHashMap[AbstractFile, RichCompilationUnit] { |