diff options
| author | Martin Odersky <odersky@gmail.com> | 2014-07-15 08:58:27 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2014-08-03 16:55:18 +0200 |
| commit | 70bd06c81aa82e7b6ffd45d3d41e2817f0edb29b (patch) | |
| tree | e7ddcb5ee315ee3af3308ca2f28f226b853839ee /src/dotty/tools/dotc/core/pickling | |
| parent | 2f298924940453ec0ed15afd36da8c66bd7e80d1 (diff) | |
| download | dotty-70bd06c81aa82e7b6ffd45d3d41e2817f0edb29b.tar.gz dotty-70bd06c81aa82e7b6ffd45d3d41e2817f0edb29b.tar.bz2 dotty-70bd06c81aa82e7b6ffd45d3d41e2817f0edb29b.zip | |
Eliminate JavaRepeatedParamClass
Having two repeated param classes (and two types) does not work,
because we need to maintain an overriding relationship between
Scala repeated param methods and Java repeated param methods (this
will be resolved later by bridges).
Diffstat (limited to 'src/dotty/tools/dotc/core/pickling')
| -rw-r--r-- | src/dotty/tools/dotc/core/pickling/UnPickler.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/pickling/UnPickler.scala b/src/dotty/tools/dotc/core/pickling/UnPickler.scala index 36b2c99bf..de3f626da 100644 --- a/src/dotty/tools/dotc/core/pickling/UnPickler.scala +++ b/src/dotty/tools/dotc/core/pickling/UnPickler.scala @@ -70,7 +70,7 @@ object UnPickler { } /** Convert array parameters denoting a repeated parameter of a Java method - * to `JavaRepeatedParamClass` types. + * to `RepeatedParamClass` types. */ def arrayToRepeated(tp: Type)(implicit ctx: Context): Type = tp match { case tp @ MethodType(paramNames, paramTypes) => @@ -85,7 +85,7 @@ object UnPickler { } tp.derivedMethodType( paramNames, - paramTypes.init :+ defn.JavaRepeatedParamType.appliedTo(elemtp), + paramTypes.init :+ defn.RepeatedParamType.appliedTo(elemtp), tp.resultType) case tp @ PolyType(paramNames) => tp.derivedPolyType(paramNames, tp.paramBounds, arrayToRepeated(tp.resultType)) |