summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-11-22 03:22:32 -0800
committerJason Zaugg <jzaugg@gmail.com>2013-11-22 03:22:32 -0800
commitad5fa95d55096e498c461471528d957ffc82706c (patch)
tree7a339fe8c34ef679642e3ffeac9877e0c4ba40e5 /src
parent2a87aa841bb20bd76bbcd6aa7d335c2555b7ad80 (diff)
parent1050745dca08e1d98506b99ea03d47a602d11bc8 (diff)
downloadscala-ad5fa95d55096e498c461471528d957ffc82706c.tar.gz
scala-ad5fa95d55096e498c461471528d957ffc82706c.tar.bz2
scala-ad5fa95d55096e498c461471528d957ffc82706c.zip
Merge pull request #3162 from retronym/ticket/7985
SI-7985 Allow qualified type argument in patterns
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/Parsers.scala8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index ef4052d5f3..0429e295b4 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -1774,10 +1774,12 @@ self =>
in.nextToken()
if (in.token == SUBTYPE || in.token == SUPERTYPE) wildcardType(start)
else atPos(start) { Bind(tpnme.WILDCARD, EmptyTree) }
- case IDENTIFIER if nme.isVariableName(in.name) =>
- atPos(start) { Bind(identForType(), EmptyTree) }
case _ =>
- typ()
+ typ() match {
+ case Ident(name: TypeName) if nme.isVariableName(name) =>
+ atPos(start) { Bind(name, EmptyTree) }
+ case t => t
+ }
}
}