diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-10-01 15:12:32 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-11-11 15:52:33 -0800 |
| commit | 279e785d0b204b816359d5eeb3e3cbbc6215e0ee (patch) | |
| tree | 2d45a390afa1fdd298defd52646a5eb2ee162d40 /src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala | |
| parent | 5d9ed5c752b12f5cd138e707dfd53b00066efe66 (diff) | |
| download | scala-279e785d0b204b816359d5eeb3e3cbbc6215e0ee.tar.gz scala-279e785d0b204b816359d5eeb3e3cbbc6215e0ee.tar.bz2 scala-279e785d0b204b816359d5eeb3e3cbbc6215e0ee.zip | |
Cleanups, debuglogs, small refactorings
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala index f12f6c4e18..854acd63c0 100644 --- a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala +++ b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala @@ -159,19 +159,24 @@ abstract class ExplicitOuter extends InfoTransform * elides outer pointers. */ def transformInfo(sym: Symbol, tp: Type): Type = tp match { - case MethodType(params, restpe1) => - val restpe = transformInfo(sym, restpe1) - if (sym.owner.isTrait && ((sym hasFlag (ACCESSOR | SUPERACCESSOR)) || sym.isModule)) { // 5 - sym.makeNotPrivate(sym.owner) + case MethodType(params, resTp) => + val resTpTransformed = transformInfo(sym, resTp) + + // juggle flags (and mangle names) after transforming info + if (sym.owner.isTrait) { + // TODO: I don't believe any private accessors remain after the fields phase + if ((sym hasFlag (ACCESSOR | SUPERACCESSOR)) || sym.isModule) sym.makeNotPrivate(sym.owner) // 5 + if (sym.isProtected) sym setFlag notPROTECTED // 6 } - if (sym.owner.isTrait && sym.isProtected) sym setFlag notPROTECTED // 6 - if (sym.isClassConstructor && isInner(sym.owner)) { // 1 - val p = sym.newValueParameter(innerClassConstructorParamName, sym.pos) - .setInfo(sym.owner.outerClass.thisType) - MethodType(p :: params, restpe) - } else if (restpe ne restpe1) - MethodType(params, restpe) + + val paramsWithOuter = + if (sym.isClassConstructor && isInner(sym.owner)) // 1 + sym.newValueParameter(innerClassConstructorParamName, sym.pos).setInfo(sym.owner.outerClass.thisType) :: params + else params + + if ((resTpTransformed ne resTp) || (paramsWithOuter ne params)) MethodType(paramsWithOuter, resTpTransformed) else tp + case ClassInfoType(parents, decls, clazz) => var decls1 = decls if (isInner(clazz) && !clazz.isInterface) { |