diff options
author | Paul Phillips <paulp@improving.org> | 2011-12-27 10:09:40 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-12-27 10:09:40 -0800 |
commit | 99c5d831613bf49afc702dc6aca7ce47b30eab7b (patch) | |
tree | 00830cf4698cb13ce1d5fb5185be4f77a59ed09a /src | |
parent | 10f228e99ff67da00cb00ca4e0b2e26c2d1e8cd6 (diff) | |
parent | 935ba9ba3021b518dab8f22c1e5d897865777aab (diff) | |
download | scala-99c5d831613bf49afc702dc6aca7ce47b30eab7b.tar.gz scala-99c5d831613bf49afc702dc6aca7ce47b30eab7b.tar.bz2 scala-99c5d831613bf49afc702dc6aca7ce47b30eab7b.zip |
Merge branch 'type-currying-mini' of /scala/trunk into develop
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 7 |
1 files changed, 4 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 e27d5cacda..00ac3976a9 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -1534,9 +1534,10 @@ self => val t1 = stripParens(t) t1 match { case Ident(_) | Select(_, _) => - val tapp = atPos(t1.pos.startOrPoint, in.offset) { - TypeApply(t1, exprTypeArgs()) - } + var tapp: Tree = t1 + while (in.token == LBRACKET) + tapp = atPos(tapp.pos.startOrPoint, in.offset)(TypeApply(tapp, exprTypeArgs())) + simpleExprRest(tapp, true) case _ => t1 |