diff options
| author | Martin Odersky <odersky@gmail.com> | 2017-03-27 18:23:07 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2017-04-11 09:33:11 +0200 |
| commit | 21ab9a1355036aa953db4e1f87c8f0f9a06506b5 (patch) | |
| tree | 3824573b541226f7e90609e7163383b471838667 /compiler/src/dotty/tools/dotc/core/tasty | |
| parent | 0efd6b93cf45be4cb211093185fef2923f53ef67 (diff) | |
| download | dotty-21ab9a1355036aa953db4e1f87c8f0f9a06506b5.tar.gz dotty-21ab9a1355036aa953db4e1f87c8f0f9a06506b5.tar.bz2 dotty-21ab9a1355036aa953db4e1f87c8f0f9a06506b5.zip | |
Get rid of ExpandedName flag
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/tasty')
4 files changed, 4 insertions, 4 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala b/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala index 74c4265f2..a09a21964 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala @@ -62,7 +62,7 @@ class NameBuffer extends TastyBuffer(10000) { withLength { writeNameRef(qualified); writeNameRef(selector) } case FlattenedName(qualified, selector) => withLength { writeNameRef(qualified); writeNameRef(selector) } - case XpandedName(prefix, original) => + case ExpandedName(prefix, original) => withLength { writeNameRef(prefix); writeNameRef(original) } case SignedName(original, Signature(params, result)) => withLength( diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala index 6dd22db88..d20e890c2 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala @@ -54,7 +54,7 @@ class TastyUnpickler(reader: TastyReader) { case FLATTENED => FlattenedName(readName(), readName().asSimpleName) case EXPANDED => - XpandedName(readName(), readName().asSimpleName) + ExpandedName(readName(), readName().asSimpleName) case SIGNED => val original = readName() val result = readName().toTypeName diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala index 2da638291..e697ff028 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala @@ -13,6 +13,7 @@ import NameOps._, NameExtractors._ import StdNames.nme import TastyBuffer._ import TypeApplications._ +import transform.SymUtils._ import config.Config class TreePickler(pickler: TastyPickler) { @@ -141,7 +142,7 @@ class TreePickler(pickler: TastyPickler) { withLength { pickleType(tycon); args.foreach(pickleType(_)) } case ConstantType(value) => pickleConstant(value) - case tpe: TypeRef if tpe.info.isAlias && tpe.symbol.is(Flags.AliasPreferred) => + case tpe: TypeRef if tpe.info.isAlias && tpe.symbol.isAliasPreferred => pickleType(tpe.superType) case tpe: WithFixedSym => val sym = tpe.symbol diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala index 11c04e2b4..d8497f39d 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala @@ -428,7 +428,6 @@ class TreeUnpickler(reader: TastyReader, nameAtRef: NameRef => TermName, posUnpi if (!rhsIsEmpty) skipTree() val (givenFlags, annots, privateWithin) = readModifiers(end) val nameFlags = - (if (name.is(XpandedName)) ExpandedName else EmptyFlags) | (if (name.is(NameExtractors.SuperAccessorName)) SuperAccessor else EmptyFlags) pickling.println(i"creating symbol $name at $start with flags $givenFlags") val flags = normalizeFlags(tag, givenFlags | nameFlags, name, isAbsType, rhsIsEmpty) |