@@ -197,9 +197,9 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) {
197
197
// ------ Reading types -----------------------------------------------------
198
198
199
199
/** Read names in an interleaved sequence of (parameter) names and types/bounds */
200
- def readParamNames [ N <: Name ] (end : Addr ): List [N ] =
200
+ def readParamNames (end : Addr ): List [Name ] =
201
201
until(end) {
202
- val name = readName(). asInstanceOf [ N ]
202
+ val name = readName()
203
203
skipTree()
204
204
name
205
205
}
@@ -244,11 +244,11 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) {
244
244
def readLengthType (): Type = {
245
245
val end = readEnd()
246
246
247
- def readNamesSkipParams [ N <: Name ] : (List [N ], TreeReader ) = {
247
+ def readNamesSkipParams : (List [Name ], TreeReader ) = {
248
248
val nameReader = fork
249
249
nameReader.skipTree() // skip result
250
250
val paramReader = nameReader.fork
251
- (nameReader.readParamNames[ N ] (end), paramReader)
251
+ (nameReader.readParamNames(end), paramReader)
252
252
}
253
253
254
254
val result =
@@ -288,24 +288,24 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) {
288
288
registerSym(start, sym)
289
289
TypeRef .withFixedSym(NoPrefix , sym.name, sym)
290
290
case LAMBDAtype =>
291
- val (rawNames, paramReader) = readNamesSkipParams[ TypeName ]
291
+ val (rawNames, paramReader) = readNamesSkipParams
292
292
val (variances, paramNames) = rawNames
293
- .map(name => (prefixToVariance(name.head), name.tail.asTypeName )).unzip
293
+ .map(name => (prefixToVariance(name.head), name.tail.toTypeName )).unzip
294
294
val result = TypeLambda (paramNames, variances)(
295
295
pt => registeringType(pt, paramReader.readParamTypes[TypeBounds ](end)),
296
296
pt => readType())
297
297
goto(end)
298
298
result
299
299
case POLYtype =>
300
- val (names, paramReader) = readNamesSkipParams[ TypeName ]
301
- val result = PolyType (names)(
300
+ val (names, paramReader) = readNamesSkipParams
301
+ val result = PolyType (names.map(_.toTypeName) )(
302
302
pt => registeringType(pt, paramReader.readParamTypes[TypeBounds ](end)),
303
303
pt => readType())
304
304
goto(end)
305
305
result
306
306
case METHODtype =>
307
- val (names, paramReader) = readNamesSkipParams[ TermName ]
308
- val result = MethodType (names, paramReader.readParamTypes[Type ](end))(
307
+ val (names, paramReader) = readNamesSkipParams
308
+ val result = MethodType (names.map(_.toTermName) , paramReader.readParamTypes[Type ](end))(
309
309
mt => registeringType(mt, readType()))
310
310
goto(end)
311
311
result
0 commit comments