Fix for #1365, '_' should be a standard identif...

Fix for #1365, '_' should be a standard identifier char.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala b/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala
index bab12f3798..2489c623e9 100644
--- a/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala
+++ b/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala
@@ -35,7 +35,7 @@ import collection.mutable.HashSet
 class StdLexical extends Lexical with StdTokens {
   // see `token' in `Scanners'
   def token: Parser[Token] =
-    ( letter ~ rep( letter | digit )                    ^^ { case first ~ rest => processIdent(first :: rest mkString "") }
+    ( identChar ~ rep( identChar | digit )              ^^ { case first ~ rest => processIdent(first :: rest mkString "") }
     | digit ~ rep( digit )                              ^^ { case first ~ rest => NumericLit(first :: rest mkString "") }
     | '\'' ~ rep( chrExcept('\'', '\n', EofCh) ) ~ '\'' ^^ { case '\'' ~ chars ~ '\'' => StringLit(chars mkString "") }
     | '\"' ~ rep( chrExcept('\"', '\n', EofCh) ) ~ '\"' ^^ { case '\"' ~ chars ~ '\"' => StringLit(chars mkString "") }
@@ -46,6 +46,9 @@ class StdLexical extends Lexical with StdTokens {
     | failure("illegal character")
     )
 
+  // legal identifier chars other than digits
+  def identChar = letter | elem('_')
+
   // see `whitespace in `Scanners'
   def whitespace: Parser[Any] = rep(
       whitespaceChar