diff options
| author | James Roper <james@jazzy.id.au> | 2012-10-05 12:22:24 +1000 |
|---|---|---|
| committer | James Iry <jamesiry@gmail.com> | 2013-02-07 15:00:20 -0800 |
| commit | 6052e19292c95270ac0a4bf30b6df47a257f88d4 (patch) | |
| tree | 9e01e95923e20f2bb665826c492d3fc9f15b46d0 /src/library | |
| parent | 0dd02d92a363ee13b13eb4536c938d24bb5dd98d (diff) | |
| download | scala-6052e19292c95270ac0a4bf30b6df47a257f88d4.tar.gz scala-6052e19292c95270ac0a4bf30b6df47a257f88d4.tar.bz2 scala-6052e19292c95270ac0a4bf30b6df47a257f88d4.zip | |
[backport] SI-6478 Fixing JavaTokenParser ident
Backport of 256934160007079f473131469af2df4d023c2cfc from PR
https://github.com/scala/scala/pull/1466
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/util/parsing/combinator/JavaTokenParsers.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/library/scala/util/parsing/combinator/JavaTokenParsers.scala b/src/library/scala/util/parsing/combinator/JavaTokenParsers.scala index 78817cfb67..89832d3fb2 100644 --- a/src/library/scala/util/parsing/combinator/JavaTokenParsers.scala +++ b/src/library/scala/util/parsing/combinator/JavaTokenParsers.scala @@ -21,11 +21,12 @@ import scala.annotation.migration * - `floatingPointNumber` */ trait JavaTokenParsers extends RegexParsers { - /** Anything starting with an ASCII alphabetic character or underscore, - * followed by zero or more repetitions of regex's `\w`. + /** Anything that is a valid Java identifier, according to + * <a href="http://docs.oracle.com/javase/specs/jls/se7/html/jls-3.html#jls-3.8">The Java Language Spec</a>. + * Generally, this means a letter, followed by zero or more letters or numbers. */ def ident: Parser[String] = - """[a-zA-Z_]\w*""".r + """\p{javaJavaIdentifierStart}\p{javaJavaIdentifierPart}*""".r /** An integer, without sign or with a negative sign. */ def wholeNumber: Parser[String] = """-?\d+""".r |