diff options
author | Paul Phillips <paulp@improving.org> | 2012-10-06 08:37:42 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-10-06 08:37:42 -0700 |
commit | e47b45864118c16d260cac364d34dc0375c31fab (patch) | |
tree | ca3927f30b313341f550f47b6647ccfbacf509e1 /src | |
parent | 869eb5cb2ea0c78fbc2fbca70c96b97b93d1b166 (diff) | |
parent | 256934160007079f473131469af2df4d023c2cfc (diff) | |
download | scala-e47b45864118c16d260cac364d34dc0375c31fab.tar.gz scala-e47b45864118c16d260cac364d34dc0375c31fab.tar.bz2 scala-e47b45864118c16d260cac364d34dc0375c31fab.zip |
Merge pull request #1466 from jroper/patch-1
SI-6478 Fixing JavaTokenParser.ident
Diffstat (limited to 'src')
-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 520ac8cc2c..4e8504d346 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 |