From 0ad1cd816bc1537ad332addabb0ff6c293e3e0a0 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 24 Mar 2017 13:20:01 +0100 Subject: Add default getter names Plus various bug fixes and filling in missing functionality --- .../src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'compiler/src/dotty/tools/dotc/core/unpickleScala2') 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) -- cgit v1.2.3