Polishings

Author: odersky

compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala

@@ -93,7 +93,7 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer {
       def _isInstanceOf(b: Symbol, tp: Type): Tree
       /* tgt is expected to be a Seq, call tgt.drop(n) */
       def drop(tgt: Tree)(n: Int): Tree
-      /* tgt is expected to have method apply(int), call tgt.drop(i) */
+      /* tgt is expected to have method apply(int), call tgt.apply(i) */
       def index(tgt: Tree)(i: Int): Tree
       /* make tree that accesses the i'th component of the tuple referenced by binder */
       def tupleSel(binder: Symbol)(i: Int): Tree

compiler/src/dotty/tools/dotc/typer/Applications.scala

@@ -33,13 +33,8 @@ import reporting.diagnostic.Message
 object Applications {
   import tpd._
 
-  def extractorMember(tp: Type, name: Name)(implicit ctx: Context) = {
-    def isPossibleExtractorType(tp: Type) = tp match {
-      case _: MethodOrPoly => false
-      case _ => true
-    }
-    tp.member(name).suchThat(d => isPossibleExtractorType(d.info))
-  }
+  def extractorMember(tp: Type, name: Name)(implicit ctx: Context) =
+    tp.member(name).suchThat(_.info.isParameterless)
 
   def extractorMemberType(tp: Type, name: Name, errorPos: Position = NoPosition)(implicit ctx: Context) = {
     val ref = extractorMember(tp, name)
@@ -72,7 +67,8 @@ object Applications {
     if (defn.isProductSubType(tp)) productSelectorTypes(tp).size else -1
 
   def productSelectors(tp: Type)(implicit ctx: Context): List[Symbol] = {
-    val sels = for (n <- Iterator.from(0)) yield tp.member(nme.selectorName(n)).symbol
+    val sels = for (n <- Iterator.from(0)) yield
+      tp.member(nme.selectorName(n)).suchThat(_.info.isParameterless).symbol
     sels.takeWhile(_.exists).toList
   }