diff options
| author | Martin Odersky <odersky@gmail.com> | 2017-03-27 21:55:26 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2017-04-11 09:33:11 +0200 |
| commit | 0021ffb0f1a0a857b7cdc8cdf769ae727dcb4b2c (patch) | |
| tree | 89499a1172e48e81a86d61242090819d658c5aa7 /compiler/src/dotty/tools/dotc/core/tasty | |
| parent | 1d6f5f7f33f9e4be29553cb7ef1e6f054a64dc6b (diff) | |
| download | dotty-0021ffb0f1a0a857b7cdc8cdf769ae727dcb4b2c.tar.gz dotty-0021ffb0f1a0a857b7cdc8cdf769ae727dcb4b2c.tar.bz2 dotty-0021ffb0f1a0a857b7cdc8cdf769ae727dcb4b2c.zip | |
Add ShadowedName and AvoidClashName
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/tasty')
3 files changed, 4 insertions, 2 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala index de70c04f3..792c11cee 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala @@ -230,6 +230,8 @@ object TastyFormat { final val SUPERACCESSOR = 20 final val INITIALIZER = 21 final val SHADOWED = 22 + final val LOCALDUMMY = 23 + final val AVOIDCLASH = 27 final val OBJECTCLASS = 29 final val SIGNED = 63 diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala index e697ff028..355eef1ca 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala @@ -352,7 +352,7 @@ class TreePickler(pickler: TastyPickler) { case Select(qual, name) => writeByte(if (name.isTypeName) SELECTtpt else SELECT) val realName = tree.tpe match { - case tp: NamedType if tp.name.isShadowedName => tp.name + case tp: NamedType if tp.name.is(ShadowedName) => tp.name case _ => name } val sig = tree.tpe.signature diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala index 8a9b68093..b8e6bbdf0 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala @@ -857,7 +857,7 @@ class TreeUnpickler(reader: TastyReader, nameAtRef: NameRef => TermName, posUnpi val localCtx = if (name == nme.CONSTRUCTOR) ctx.addMode(Mode.InSuperCall) else ctx val qual = readTerm()(localCtx) - val unshadowed = if (name.isShadowedName) name.revertShadowed else name + val unshadowed = name.exclude(ShadowedName) untpd.Select(qual, unshadowed).withType(tpf(qual.tpe.widenIfUnstable)) } |