diff options
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/tasty')
-rw-r--r-- | compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala | 16 | ||||
-rw-r--r-- | compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala | 16 |
2 files changed, 10 insertions, 22 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala b/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala index a09a21964..df43eabb2 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala @@ -58,26 +58,18 @@ class NameBuffer extends TastyBuffer(10000) { else Codec.toUTF8(chrs, name.start, name.length) writeNat(bytes.length) writeBytes(bytes, bytes.length) - case QualifiedName(qualified, selector) => - withLength { writeNameRef(qualified); writeNameRef(selector) } - case FlattenedName(qualified, selector) => - withLength { writeNameRef(qualified); writeNameRef(selector) } - case ExpandedName(prefix, original) => - withLength { writeNameRef(prefix); writeNameRef(original) } + case AnyQualifiedName(prefix, info) => + withLength { writeNameRef(prefix); writeNameRef(info.name) } case SignedName(original, Signature(params, result)) => withLength( { writeNameRef(original); writeNameRef(result); params.foreach(writeNameRef) }, if ((params.length + 2) * maxIndexWidth <= maxNumInByte) 1 else 2) - case ModuleClassName(module) => - withLength { writeNameRef(module) } - case SuperAccessorName(accessed) => - withLength { writeNameRef(accessed) } case DefaultGetterName(method, paramNumber) => withLength { writeNameRef(method); writeNat(paramNumber) } - case ShadowedName(original) => - withLength { writeNameRef(original) } case VariantName(original, sign) => withLength { writeNameRef(original); writeNat(sign + 1) } + case DerivedTermName(original, info) => + withLength { writeNameRef(original) } } } diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala index d20e890c2..7ebf3a2ea 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala @@ -55,6 +55,10 @@ class TastyUnpickler(reader: TastyReader) { FlattenedName(readName(), readName().asSimpleName) case EXPANDED => ExpandedName(readName(), readName().asSimpleName) + case DEFAULTGETTER => + DefaultGetterName(readName(), readNat()) + case VARIANT => + VariantName(readName(), readNat() - 1) case SIGNED => val original = readName() val result = readName().toTypeName @@ -62,16 +66,8 @@ class TastyUnpickler(reader: TastyReader) { var sig = Signature(params, result) if (sig == Signature.NotAMethod) sig = Signature.NotAMethod SignedName(original, sig) - case OBJECTCLASS => - ModuleClassName(readName()) - case SUPERACCESSOR => - SuperAccessorName(readName()) - case DEFAULTGETTER => - DefaultGetterName(readName(), readNat()) - case SHADOWED => - ShadowedName(readName()) - case VARIANT => - VariantName(readName(), readNat() - 1) + case _ => + extractorOfTag(tag)(readName()) } assert(currentAddr == end, s"bad name $result $start $currentAddr $end") result |