diff options
author | Martin Odersky <odersky@gmail.com> | 2015-11-08 10:33:58 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2015-11-09 15:45:40 +0100 |
commit | 4f01f62ac216fa9034d343828aa6f4be626d9b36 (patch) | |
tree | 9a0dbba0554183199aa3f1389e7e166851073bb8 /src/dotty/tools/dotc/core/classfile/ClassfileParser.scala | |
parent | 2d7a05fa46016ea54e10a80735e04b33fd0938d1 (diff) | |
download | dotty-4f01f62ac216fa9034d343828aa6f4be626d9b36.tar.gz dotty-4f01f62ac216fa9034d343828aa6f4be626d9b36.tar.bz2 dotty-4f01f62ac216fa9034d343828aa6f4be626d9b36.zip |
Shorten ..Class.typeRef to ..Type
Since we now have two forms of (almost) everything in Definitions,
might as well profit from it.
Diffstat (limited to 'src/dotty/tools/dotc/core/classfile/ClassfileParser.scala')
-rw-r--r-- | src/dotty/tools/dotc/core/classfile/ClassfileParser.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala index ca805f516..9ea24324b 100644 --- a/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala +++ b/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala @@ -104,7 +104,7 @@ class ClassfileParser( /** Parse parents for Java classes. For Scala, return AnyRef, since the real type will be unpickled. * Updates the read pointer of 'in'. */ def parseParents: List[Type] = { - val superType = if (isAnnotation) { in.nextChar; defn.AnnotationClass.typeRef } + val superType = if (isAnnotation) { in.nextChar; defn.AnnotationType } else pool.getSuperClass(in.nextChar).typeRef val ifaceCount = in.nextChar var ifaces = for (i <- (0 until ifaceCount).toList) yield pool.getSuperClass(in.nextChar).typeRef @@ -115,7 +115,7 @@ class ClassfileParser( // is found. If we treat constant subtyping specially, we might be able // to do something there. But in any case, the until should be more efficient. - if (isAnnotation) ifaces = defn.ClassfileAnnotationClass.typeRef :: ifaces + if (isAnnotation) ifaces = defn.ClassfileAnnotationType :: ifaces superType :: ifaces } |