diff options
| author | odersky <odersky@gmail.com> | 2017-04-13 11:43:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-13 11:43:37 +0200 |
| commit | b8ed254e38480eb8892eccd897d525d977d9e6a7 (patch) | |
| tree | 902b9c8fa209f730746ef84dc895ff2710badd24 /compiler/src/dotty/tools/dotc/typer | |
| parent | 46e3395693b6f8749aa0b01b41b7d643f3bef5dc (diff) | |
| parent | 3e04b6f3aa4e4088220f199bd6aa5c6644c22354 (diff) | |
| download | dotty-b8ed254e38480eb8892eccd897d525d977d9e6a7.tar.gz dotty-b8ed254e38480eb8892eccd897d525d977d9e6a7.tar.bz2 dotty-b8ed254e38480eb8892eccd897d525d977d9e6a7.zip | |
Merge pull request #2249 from dotty-staging/revert-product
Revert <: Product requierment in pattern matching
Diffstat (limited to 'compiler/src/dotty/tools/dotc/typer')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/typer/Applications.scala | 7 | ||||
| -rw-r--r-- | compiler/src/dotty/tools/dotc/typer/Typer.scala | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala index c4d3e2292..7e17abbcd 100644 --- a/compiler/src/dotty/tools/dotc/typer/Applications.scala +++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala @@ -48,9 +48,6 @@ object Applications { ref.info.widenExpr.dealias } - def canProductMatch(tp: Type)(implicit ctx: Context) = - extractorMemberType(tp, nme._1).exists - /** Does `tp` fit the "product match" conditions as an unapply result type * for a pattern with `numArgs` subpatterns? * This is the case of `tp` has members `_1` to `_N` where `N == numArgs`. @@ -72,7 +69,7 @@ object Applications { } def productArity(tp: Type)(implicit ctx: Context) = - if (canProductMatch(tp)) productSelectorTypes(tp).size else -1 + 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 @@ -114,7 +111,7 @@ object Applications { getUnapplySelectors(getTp, args, pos) else if (unapplyResult isRef defn.BooleanClass) Nil - else if (canProductMatch(unapplyResult)) + else if (defn.isProductSubType(unapplyResult)) productSelectorTypes(unapplyResult) // this will cause a "wrong number of arguments in pattern" error later on, // which is better than the message in `fail`. diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 4bf938fd4..02538671e 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -759,7 +759,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit /** Is `formal` a product type which is elementwise compatible with `params`? */ def ptIsCorrectProduct(formal: Type) = { isFullyDefined(formal, ForceDegree.noBottom) && - Applications.canProductMatch(formal) && + defn.isProductSubType(formal) && Applications.productSelectorTypes(formal).corresponds(params) { (argType, param) => param.tpt.isEmpty || argType <:< typedAheadType(param.tpt).tpe |