summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2010-06-29 12:32:45 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2010-06-29 12:32:45 +0000
commit1067f5f55ca0de0035fee3d0179203801f0b4b87 (patch)
treea76deb0da297f758321676fd9e80b39a2b3b46a9 /src
parentbf639030734f9eed8c07342fb30e5d4fc94d850b (diff)
downloadscala-1067f5f55ca0de0035fee3d0179203801f0b4b87.tar.gz
scala-1067f5f55ca0de0035fee3d0179203801f0b4b87.tar.bz2
scala-1067f5f55ca0de0035fee3d0179203801f0b4b87.zip
close #2413.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
index ea2cfd6204..3dfbbbb77f 100644
--- a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
@@ -272,12 +272,22 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT
case _ => Nil
}
+ // fix for #2413
+ object javaToScalaRepeated extends TypeMap {
+ def apply(tp: Type): Type = tp match {
+ case tp @ TypeRef(_, _, List(arg)) if tp.typeSymbol == definitions.JavaRepeatedParamClass =>
+ appliedType(definitions.RepeatedParamClass.typeConstructor, List(arg))
+ case _ =>
+ mapOver(tp)
+ }
+ }
+
assert(clazz != NoSymbol, sym)
if (settings.debug.value) log("Decided for host class: " + clazz)
val accName = nme.protName(sym.originalName)
val hasArgs = sym.tpe.paramTypes != Nil
- val memberType = sym.tpe // transform(sym.tpe)
+ val memberType = javaToScalaRepeated(sym.tpe) // transform(sym.tpe)
// if the result type depends on the this type of an enclosing class, the accessor
// has to take an object of exactly this type, otherwise it's more general