diff options
author | Martin Odersky <odersky@gmail.com> | 2013-11-18 19:04:33 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2013-11-18 19:05:27 +0100 |
commit | b6d7b28403c34f61c5317c37acce1b4118a4181c (patch) | |
tree | bbfee77f416b2746c37f13fd541d7b30905a4bf0 /src/dotty/tools/dotc/core/pickling/UnPickler.scala | |
parent | f046e7a0c26500850a51e2f60122631b2c807f65 (diff) | |
download | dotty-b6d7b28403c34f61c5317c37acce1b4118a4181c.tar.gz dotty-b6d7b28403c34f61c5317c37acce1b4118a4181c.tar.bz2 dotty-b6d7b28403c34f61c5317c37acce1b4118a4181c.zip |
Various cleanups
Diffstat (limited to 'src/dotty/tools/dotc/core/pickling/UnPickler.scala')
-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 400fcba86..386ea3d85 100644 --- a/src/dotty/tools/dotc/core/pickling/UnPickler.scala +++ b/src/dotty/tools/dotc/core/pickling/UnPickler.scala @@ -73,7 +73,7 @@ object UnPickler { def arrayToRepeated(tp: Type)(implicit ctx: Context): Type = tp match { case tp @ MethodType(paramNames, paramTypes) => val lastArg = paramTypes.last - assert(lastArg.isArray) + assert(lastArg isRef defn.ArrayClass) val elemtp0 :: Nil = lastArg.baseTypeArgs(defn.ArrayClass) val elemtp = elemtp0 match { case AndType(t1, t2) if t1.typeSymbol.isAbstractType && (t2 isRef defn.ObjectClass) => @@ -555,7 +555,7 @@ class UnPickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClassRoot: case info: TypeRef if boundSyms contains info.symbol => val info1 = info.symbol.info assert(info1.derivesFrom(defn.SingletonClass)) - RefinedType(parent1, name, info1.mapAnd(removeSingleton)) + RefinedType(parent1, name, info1.mapReduceAnd(removeSingleton)(_ & _)) case info => tp.derivedRefinedType(parent1, name, info) } |