diff options
| author | Martin Odersky <odersky@gmail.com> | 2017-03-22 11:18:36 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2017-04-11 09:33:10 +0200 |
| commit | 67105e3f36378d652aa919e23aa3b2678004bdc6 (patch) | |
| tree | 66518be63b607e3766982fb081b31eca0726d2fa /compiler/src/dotty/tools/dotc/core/unpickleScala2 | |
| parent | 01d9659e21a149801fd8ced6652cc0e94f4827e2 (diff) | |
| download | dotty-67105e3f36378d652aa919e23aa3b2678004bdc6.tar.gz dotty-67105e3f36378d652aa919e23aa3b2678004bdc6.tar.bz2 dotty-67105e3f36378d652aa919e23aa3b2678004bdc6.zip | |
Start to use structured ModuleNames
Subject to flags Config.semanticNames.
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 cf99bb022..a49379327 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -432,7 +432,8 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas } val name1 = name0.adjustIfModuleClass(flags) - val name = if (name1 == nme.TRAIT_CONSTRUCTOR) nme.CONSTRUCTOR else name1 + val name2 = if (name1 == nme.TRAIT_CONSTRUCTOR) nme.CONSTRUCTOR else name1 + val name = if (flags is ModuleClass) name2.unmangleClassName else name2 def isClassRoot = (name == classRoot.name) && (owner == classRoot.owner) && !(flags is ModuleClass) def isModuleClassRoot = (name == moduleClassRoot.name) && (owner == moduleClassRoot.owner) && (flags is Module) |