diff options
author | Martin Odersky <odersky@gmail.com> | 2015-11-22 17:47:57 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2015-11-22 18:03:17 +0100 |
commit | e7fdb416006cfa4091b90935c74b5602adb5f68e (patch) | |
tree | 1070807d8eb3d3b37cc6047f5362543557bbfec8 /src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | |
parent | dce7053f3a6b859733253edcc82ad42b6ea3ed73 (diff) | |
download | dotty-e7fdb416006cfa4091b90935c74b5602adb5f68e.tar.gz dotty-e7fdb416006cfa4091b90935c74b5602adb5f68e.tar.bz2 dotty-e7fdb416006cfa4091b90935c74b5602adb5f68e.zip |
Swap order of arguments in annotations
The fact that the annotation comes first is weird, because when I write
an annotated type it's <type> @<annotation>. Also, annotated types
are like RefinedTypes in that they derive from a parent type. And in
RefinedTypes the parent comes first.
So swapping the arguments improves consistency.
Diffstat (limited to 'src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala')
-rw-r--r-- | src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index d14423b7b..cf7b487bb 100644 --- a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -800,10 +800,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas val boundSyms = until(end, readSymbolRef) elimExistentials(boundSyms, restpe) case ANNOTATEDtpe => - val tp = readTypeRef() - // no annotation self type is supported, so no test whether this is a symbol ref - val annots = until(end, readAnnotationRef) - AnnotatedType.make(annots, tp) + AnnotatedType.make(readTypeRef(), until(end, readAnnotationRef)) case _ => noSuchTypeTag(tag, end) } |