diff options
| author | Martin Odersky <odersky@gmail.com> | 2017-03-29 16:58:41 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2017-04-11 09:33:11 +0200 |
| commit | a5d94d23341b2f30f677f1420f1ce088a0f1ed5b (patch) | |
| tree | 8d1ce019cf60853b3f9b8ed918f122d7c3f6ac82 /compiler/src/dotty/tools/dotc/core/unpickleScala2 | |
| parent | d5c1e6dc677ef9ef49f02075747b2301ba45fd74 (diff) | |
| download | dotty-a5d94d23341b2f30f677f1420f1ce088a0f1ed5b.tar.gz dotty-a5d94d23341b2f30f677f1420f1ce088a0f1ed5b.tar.bz2 dotty-a5d94d23341b2f30f677f1420f1ce088a0f1ed5b.zip | |
Decentralize unmangling, add new nameKinds
Start scheme where unmangling is done by NameKinds instead of
in NameOps.
Also add namekinds for protected accessors.
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/unpickleScala2')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index 976eb5df4..e4b6faa4b 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -9,6 +9,7 @@ import java.lang.Double.longBitsToDouble import Contexts._, Symbols._, Types._, Scopes._, SymDenotations._, Names._, NameOps._ import StdNames._, Denotations._, NameOps._, Flags._, Constants._, Annotations._ +import NameKinds.Scala2MethodNameKinds import dotty.tools.dotc.typer.ProtoTypes.{FunProtoTyped, FunProto} import util.Positions._ import dotty.tools.dotc.ast.{tpd, Trees, untpd}, ast.tpd._ @@ -436,7 +437,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas if (flags is Method) { name = if (name == nme.TRAIT_CONSTRUCTOR) nme.CONSTRUCTOR - else name.asTermName.unmangleMethodName + else name.asTermName.unmangle(Scala2MethodNameKinds) } if (flags is Scala2ExpandedName) { name = name.unmangleExpandedName |