diff options
| author | Martin Odersky <odersky@gmail.com> | 2017-03-24 13:20:01 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2017-04-11 09:33:10 +0200 |
| commit | 0ad1cd816bc1537ad332addabb0ff6c293e3e0a0 (patch) | |
| tree | 68ab44576e17d19fa6cca14a0f750266a638eb7f /compiler/src/dotty/tools/dotc/core/unpickleScala2 | |
| parent | a2731a8be2f3434218623c0b0ecd4078107f14a5 (diff) | |
| download | dotty-0ad1cd816bc1537ad332addabb0ff6c293e3e0a0.tar.gz dotty-0ad1cd816bc1537ad332addabb0ff6c293e3e0a0.tar.bz2 dotty-0ad1cd816bc1537ad332addabb0ff6c293e3e0a0.zip | |
Add default getter names
Plus various bug fixes and filling in missing functionality
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/unpickleScala2')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 5 |
1 files changed, 4 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 a49379327..084b8d098 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -433,7 +433,10 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas val name1 = name0.adjustIfModuleClass(flags) val name2 = if (name1 == nme.TRAIT_CONSTRUCTOR) nme.CONSTRUCTOR else name1 - val name = if (flags is ModuleClass) name2.unmangleClassName else name2 + val name = + if (flags is ModuleClass) name2.unmangleClassName + else if (flags is Method) name2.asTermName.unmangleMethodName + else name2 def isClassRoot = (name == classRoot.name) && (owner == classRoot.owner) && !(flags is ModuleClass) def isModuleClassRoot = (name == moduleClassRoot.name) && (owner == moduleClassRoot.owner) && (flags is Module) |