A little clarity for AddInterfaces.

And a couple conveniences elsewhere.

2 files changed, 35 insertions, 38 deletions

diff --git a/src/compiler/scala/reflect/internal/Symbols.scala b/src/compiler/scala/reflect/internal/Symbols.scala
index c2ef633d58..78cec02c0a 100644
--- a/src/compiler/scala/reflect/internal/Symbols.scala
+++ b/src/compiler/scala/reflect/internal/Symbols.scala
@@ -2054,7 +2054,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     def sealedDescendants: Set[Symbol] = children.flatMap(_.sealedDescendants) + this
 
     @inline final def orElse(alt: => Symbol): Symbol = if (this ne NoSymbol) this else alt
-    @inline final def andAlso(f: Symbol => Unit): Symbol = if (this eq NoSymbol) NoSymbol else { f(this) ; this }
+    @inline final def andAlso(f: Symbol => Unit): Symbol = { if (this ne NoSymbol) f(this) ; this }
 
 // ------ toString -------------------------------------------------------------------
 
diff --git a/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
index 3581f1b923..cb7d64b9fc 100644
--- a/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
+++ b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
@@ -204,10 +204,9 @@ abstract class AddInterfaces extends InfoTransform { self: Erasure =>
 
   def transformMixinInfo(tp: Type): Type = tp match {
     case ClassInfoType(parents, decls, clazz) =>
-      if (clazz.needsImplClass) {
-        clazz setFlag lateINTERFACE
-        implClass(clazz) // generate an impl class
-      }
+      if (clazz.needsImplClass)
+        implClass(clazz setFlag lateINTERFACE) // generate an impl class
+
       val parents1 = parents match {
         case Nil      => Nil
         case hd :: tl =>
@@ -215,14 +214,12 @@ abstract class AddInterfaces extends InfoTransform { self: Erasure =>
           if (clazz.isTrait) erasedTypeRef(ObjectClass) :: tl
           else parents
       }
-      val decls1 = scopeTransform(clazz) { decls filter (sym =>
-        if (clazz.isInterface) isInterfaceMember(sym)
-        else (!sym.isType || sym.isClass))
-      }
-
-      //if (!clazz.isPackageClass) System.out.println("Decls of "+clazz+" after explicitOuter = " + decls1);//DEBUG
-      //if ((parents1 eq parents) && (decls1 eq decls)) tp
-      //else
+      val decls1 = scopeTransform(clazz)(
+        decls filter (sym =>
+          if (clazz.isInterface) isInterfaceMember(sym)
+          else sym.isClass || sym.isTerm
+        )
+      )
       ClassInfoType(parents1, decls1, clazz)
     case _ =>
       tp
@@ -242,27 +239,29 @@ abstract class AddInterfaces extends InfoTransform { self: Erasure =>
     }
   }
 
-  private def ifaceMemberDef(tree: Tree): Tree =
-    if (!tree.isDef || !isInterfaceMember(tree.symbol)) EmptyTree
-    else if (needsImplMethod(tree.symbol)) DefDef(tree.symbol, EmptyTree)
-    else tree
+  private def createMemberDef(tree: Tree, isForInterface: Boolean)(create: Tree => Tree) = {
+    val isInterfaceTree = tree.isDef && isInterfaceMember(tree.symbol)
+    if (isInterfaceTree && needsImplMethod(tree.symbol))
+      create(tree)
+    else if (isInterfaceTree == isForInterface)
+      tree
+    else
+      EmptyTree
+  }
+  private def implMemberDef(tree: Tree): Tree  = createMemberDef(tree, false)(implMethodDef)
+  private def ifaceMemberDef(tree: Tree): Tree = createMemberDef(tree, true)(t => DefDef(t.symbol, EmptyTree))
 
   private def ifaceTemplate(templ: Template): Template =
     treeCopy.Template(templ, templ.parents, emptyValDef, templ.body map ifaceMemberDef)
 
-  private def implMethodDef(tree: Tree, ifaceMethod: Symbol): Tree =
-    implMethodMap.get(ifaceMethod) match {
-      case Some(implMethod) =>
-        tree.symbol = implMethod
-        new ChangeOwnerAndReturnTraverser(ifaceMethod, implMethod)(tree)
-      case None =>
-        abort("implMethod missing for " + ifaceMethod)
-    }
-
-  private def implMemberDef(tree: Tree): Tree =
-    if (!tree.isDef || !isInterfaceMember(tree.symbol)) tree
-    else if (needsImplMethod(tree.symbol)) implMethodDef(tree, tree.symbol)
-    else EmptyTree
+  /** Transforms the member tree containing the implementation
+   *  into a member of the impl class.
+   */
+  private def implMethodDef(tree: Tree): Tree = (
+    implMethodMap get tree.symbol
+            map (impl => new ChangeOwnerAndReturnTraverser(tree.symbol, impl)(tree setSymbol impl))
+      getOrElse abort("implMethod missing for " + tree.symbol)
+  )
 
   /** Add mixin constructor definition
    *    def $init$(): Unit = ()
@@ -334,14 +333,12 @@ abstract class AddInterfaces extends InfoTransform { self: Erasure =>
         case Template(parents, self, body) =>
           val parents1 = sym.owner.info.parents map (t => TypeTree(t) setPos tree.pos)
           treeCopy.Template(tree, parents1, emptyValDef, body)
-        case This(_) =>
-          if (sym.needsImplClass) {
-            val impl = implClass(sym)
-            var owner = currentOwner
-            while (owner != sym && owner != impl) owner = owner.owner;
-            if (owner == impl) This(impl) setPos tree.pos
-            else tree
-          } else tree
+        case This(_) if sym.needsImplClass =>
+          val impl = implClass(sym)
+          var owner = currentOwner
+          while (owner != sym && owner != impl) owner = owner.owner;
+          if (owner == impl) This(impl) setPos tree.pos
+          else tree
 /* !!!
         case Super(qual, mix) =>
           val mix1 = mix