summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames Roper <james@jazzy.id.au>2012-10-05 12:22:24 +1000
committerJames Roper <james@jazzy.id.au>2012-10-05 16:50:25 +1000
commit256934160007079f473131469af2df4d023c2cfc (patch)
tree86f145189cbe1cb1e6e3d2415290ac150591a726 /src
parent535ad7abfc841abfdef5110b3ee7d66164a37468 (diff)
downloadscala-256934160007079f473131469af2df4d023c2cfc.tar.gz
scala-256934160007079f473131469af2df4d023c2cfc.tar.bz2
scala-256934160007079f473131469af2df4d023c2cfc.zip
SI-6478 Fixing JavaTokenParser ident
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/util/parsing/combinator/JavaTokenParsers.scala7
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