Replace MemberBinding # memberInfo by memberBounds

Author: odersky

src/dotty/tools/dotc/core/MemberBinding.scala

@@ -2,7 +2,7 @@ package dotty.tools.dotc.core
 
 import Names.Name
 import Contexts.Context
-import Types.Type
+import Types.{Type, TypeBounds}
 
 /** A common super trait of Symbol and Refinement.
  *  Used to capture the attributes of type parameters
@@ -19,13 +19,13 @@ trait MemberBinding {
   def memberName(implicit ctx: Context): Name
 
   /** The info of the member */
-  def memberInfo(implicit ctx: Context): Type
+  def memberBounds(implicit ctx: Context): TypeBounds
 
   /** The info of the member as seen from a prefix type.
    *  This can be different from `memberInfo` if the binding
    *  is a type symbol of a class.
    */
-  def memberInfoAsSeenFrom(pre: Type)(implicit ctx: Context): Type
+  def memberBoundsAsSeenFrom(pre: Type)(implicit ctx: Context): TypeBounds
 
   /** The variance of the type parameter
    *  @pre: isTypeParam = true

src/dotty/tools/dotc/core/Symbols.scala

@@ -492,8 +492,8 @@ object Symbols {
     // MemberBinding methods
     def isTypeParam(implicit ctx: Context) = denot.is(TypeParam)
     def memberName(implicit ctx: Context): Name = name
-    def memberInfo(implicit ctx: Context) = denot.info
-    def memberInfoAsSeenFrom(pre: Type)(implicit ctx: Context) = pre.memberInfo(this)
+    def memberBounds(implicit ctx: Context) = denot.info.bounds
+    def memberBoundsAsSeenFrom(pre: Type)(implicit ctx: Context) = pre.memberInfo(this).bounds
     def memberVariance(implicit ctx: Context) = denot.variance
 
 // -------- Printing --------------------------------------------------------

src/dotty/tools/dotc/core/Types.scala

@@ -2088,8 +2088,8 @@ object Types {
       case _ => false
     }
     def memberName(implicit ctx: Context) = refinedName
-    def memberInfo(implicit ctx: Context) = refinedInfo
-    def memberInfoAsSeenFrom(pre: Type)(implicit ctx: Context) = refinedInfo
+    def memberBounds(implicit ctx: Context) = refinedInfo.bounds
+    def memberBoundsAsSeenFrom(pre: Type)(implicit ctx: Context) = memberBounds
     def memberVariance(implicit ctx: Context) = BindingKind.toVariance(refinedInfo.bounds.bindingKind)
 
     override def equals(that: Any) = that match {

src/dotty/tools/dotc/typer/Typer.scala

@@ -937,11 +937,11 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
           def typedArg(arg: untpd.Tree, tparam: MemberBinding) = {
             val (desugaredArg, argPt) =
               if (ctx.mode is Mode.Pattern)
-                (if (isVarPattern(arg)) desugar.patternVar(arg) else arg, tparam.memberInfo)
+                (if (isVarPattern(arg)) desugar.patternVar(arg) else arg, tparam.memberBounds)
               else
                 (arg, WildcardType)
             val arg1 = typed(desugaredArg, argPt)
-            adaptTypeArg(arg1, tparam.memberInfo)
+            adaptTypeArg(arg1, tparam.memberBounds)
           }
           args.zipWithConserve(tparams)(typedArg(_, _)).asInstanceOf[List[Tree]]
         }