Fixed bugs. Generalized implicit lookup.

3 files changed, 25 insertions, 9 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala
index b304b8c68a..8e1a9cc7a4 100644
--- a/src/compiler/scala/tools/nsc/transform/Mixin.scala
+++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala
@@ -299,8 +299,6 @@ abstract class Mixin extends InfoTransform {
         val sym = stat.symbol
         stat match {
           case _: DefDef if (sym.isModule && sym.owner.isClass && sym.hasFlag(PRIVATE)) =>
-            if (settings.debug.value)
-              log("implementing " + sym + sym.locationString)//debug
             val vdef = attributedDef(position(sym), gen.mkModuleVarDef(sym))
             val adef = attributedDef(
               position(sym),
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
index 27f3310c11..cac726f51e 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
@@ -300,6 +300,7 @@ trait Contexts requires Analyzer {
     def implicitss: List[List[ImplicitInfo]] = {
       if (implicitsRunId != currentRunId) {
 	implicitsRunId = currentRunId
+        implicitsCache = List()
 	val newImplicits: List[ImplicitInfo] =
 	  if (owner != outer.owner && owner.isClass && !owner.isPackageClass) {
             if (!owner.isInitialized) return outer.implicitss
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index c01cbdb689..67b667e819 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -8,7 +8,7 @@ package scala.tools.nsc.typechecker
 
 import symtab.Flags._
 import util.HashSet
-import scala.tools.nsc.util.Position
+import scala.tools.nsc.util.{Position, Set, HashSet}
 import scala.collection.mutable.{HashMap, ListBuffer}
 
 /** Methods to create symbols and to enter them into scopes. */
@@ -1666,12 +1666,17 @@ trait Typers requires Analyzer {
                 if ((mode & SUPERCONSTRmode) != 0) clazz.info.parents.head
                 else intersectionType(clazz.info.parents)
               else {
-                val ps = clazz.info.parents dropWhile (p => p.symbol.name != mix)
+                val ps = clazz.info.parents filter (p => p.symbol.name == mix)
                 if (ps.isEmpty) {
                   if (settings.debug.value) System.out.println(clazz.info.parents map (.symbol.name));//debug
-                  error(tree.pos, ""+mix+" does not name a base class of "+clazz)
+                  error(tree.pos, ""+mix+" does not name a parent class of "+clazz)
                   ErrorType
-                } else ps.head
+                } else if (ps.tail.isEmpty) {
+                  ps.head
+                } else {
+                  error(tree.pos, "ambiguous parent class qualifier")
+                  ErrorType
+                }
               }
             tree setSymbol clazz setType SuperType(selftype, owntype)
           }
@@ -1957,8 +1962,21 @@ trait Typers requires Analyzer {
       }
 
       def implicitsOfType(tp: Type): List[List[ImplicitInfo]] = {
-        val tp1 = if (isFunctionType(tp)) intersectionType(tp.typeArgs.reverse) else tp
-        tp1.baseClasses map implicitsOfClass
+        def getParts(tp: Type, s: Set[Symbol]): unit = tp match {
+          case TypeRef(pre, sym, args) if (!sym.isPackageClass) =>
+            for (val bc <- sym.info.baseClasses)
+              if (sym.isClass) s.addEntry(sym)
+            getParts(pre, s)
+            for (val arg <- args) getParts(arg, s)
+          case SingleType(pre, _) =>
+            getParts(pre, s)
+          case RefinedType(ps, _) =>
+            for (val p <- ps) getParts(p, s)
+          case _ =>
+        }
+        val classes = new HashSet[Symbol]
+        getParts(tp, classes)
+        classes.elements.map(implicitsOfClass).toList
       }
 
       def implicitsOfClass(clazz: Symbol): List[ImplicitInfo] = (
@@ -1985,4 +2003,3 @@ trait Typers requires Analyzer {
     }
   }
 }
-