diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2016-05-26 09:19:30 +0200 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2016-05-27 16:38:58 +0200 |
commit | 87b779bc96e10adc6a05635393cecc9ecbb2b4ea (patch) | |
tree | 1be89c373147945c44810fe30ccf431dea431809 /src/dotty | |
parent | cf2ae5ed82599b988f8c1a625e31fb03b5c1a0fe (diff) | |
download | dotty-87b779bc96e10adc6a05635393cecc9ecbb2b4ea.tar.gz dotty-87b779bc96e10adc6a05635393cecc9ecbb2b4ea.tar.bz2 dotty-87b779bc96e10adc6a05635393cecc9ecbb2b4ea.zip |
Change typer to infer repeated param instead of Seq in `_*` cases
Diffstat (limited to 'src/dotty')
-rw-r--r-- | src/dotty/tools/dotc/transform/PatternMatcher.scala | 5 | ||||
-rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/transform/PatternMatcher.scala b/src/dotty/tools/dotc/transform/PatternMatcher.scala index 24d0e9ae0..d77dcaae4 100644 --- a/src/dotty/tools/dotc/transform/PatternMatcher.scala +++ b/src/dotty/tools/dotc/transform/PatternMatcher.scala @@ -1094,6 +1094,7 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer {thisTrans */ object WildcardPattern { def unapply(pat: Tree): Boolean = pat match { + case Typed(_, arg) if arg.tpe.isRepeatedParam => true case Bind(nme.WILDCARD, WildcardPattern()) => true // don't skip when binding an interesting symbol! case t if (tpd.isWildcardArg(t)) => true case x: Ident => isVarPattern(x) @@ -1157,8 +1158,8 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer {thisTrans object TypeBound { def unapply(tree: Tree): Option[Type] = tree match { - case Typed(_, _) => Some(tree.typeOpt) - case _ => None + case Typed(_, arg) if !arg.tpe.isRepeatedParam => Some(tree.typeOpt) + case _ => None } } diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index 23e7cdb7b..88b6746d6 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -427,7 +427,8 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit } if (untpd.isWildcardStarArg(tree)) cases( - ifPat = ascription(TypeTree(defn.SeqType.appliedTo(pt :: Nil)), isWildcard = true), + //ifPat = ascription(TypeTree(defn.SeqType.appliedTo(pt :: Nil)), isWildcard = true), + ifPat = ascription(TypeTree(defn.RepeatedParamType.appliedTo(pt)), isWildcard = true), ifExpr = seqToRepeated(typedExpr(tree.expr, defn.SeqType)), wildName = nme.WILDCARD_STAR) else { |