diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2016-05-24 10:51:20 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan@lightbend.com> | 2016-05-24 10:51:20 -0700 |
commit | 808f3d071e97aa23b797f2c0616c207ff1f20229 (patch) | |
tree | 1aee8d0752d915f7295e29fd7778a9a82a1fa4d5 /src/compiler/scala/tools/nsc/ast/parser | |
parent | 4d28084e36e8c4072ffcd3cab35b7f22983bea4a (diff) | |
parent | 1e565d879360709758950332c19a77fffee073d1 (diff) | |
download | scala-808f3d071e97aa23b797f2c0616c207ff1f20229.tar.gz scala-808f3d071e97aa23b797f2c0616c207ff1f20229.tar.bz2 scala-808f3d071e97aa23b797f2c0616c207ff1f20229.zip |
Merge pull request #4935 from som-snytt/issue/8044-tickvar
SI-8044 Allow binding backquoted varid in patterns
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser')
-rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 0254141bfb..8413183ab6 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -1901,19 +1901,20 @@ self => } /** {{{ - * Pattern1 ::= varid `:' TypePat + * Pattern1 ::= boundvarid `:' TypePat * | `_' `:' TypePat * | Pattern2 - * SeqPattern1 ::= varid `:' TypePat + * SeqPattern1 ::= boundvarid `:' TypePat * | `_' `:' TypePat * | [SeqPattern2] * }}} */ def pattern1(): Tree = pattern2() match { case p @ Ident(name) if in.token == COLON => - if (treeInfo.isVarPattern(p)) + if (nme.isVariableName(name)) { + p.removeAttachment[BackquotedIdentifierAttachment.type] atPos(p.pos.start, in.skipToken())(Typed(p, compoundType())) - else { + } else { syntaxError(in.offset, "Pattern variables must start with a lower-case letter. (SLS 8.1.1.)") p } @@ -1921,10 +1922,9 @@ self => } /** {{{ - * Pattern2 ::= varid [ @ Pattern3 ] + * Pattern2 ::= id @ Pattern3 + * | `_' @ Pattern3 * | Pattern3 - * SeqPattern2 ::= varid [ @ SeqPattern3 ] - * | SeqPattern3 * }}} */ def pattern2(): Tree = { @@ -1935,7 +1935,7 @@ self => case Ident(nme.WILDCARD) => in.nextToken() pattern3() - case Ident(name) if treeInfo.isVarPattern(p) => + case Ident(name) => in.nextToken() atPos(p.pos.start) { Bind(name, pattern3()) } case _ => p |