summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-11-09 17:27:07 +0000
committermichelou <michelou@epfl.ch>2007-11-09 17:27:07 +0000
commit08f096df8c8fd85f92ee75bcc6c3a5082e0f4a90 (patch)
tree68bf2f2f9d37a559f955db03dab0f7087fff05a9 /src
parenta49aba6e8275d78d13003a959b240a4c8e4fca5b (diff)
downloadscala-08f096df8c8fd85f92ee75bcc6c3a5082e0f4a90.tar.gz
scala-08f096df8c8fd85f92ee75bcc6c3a5082e0f4a90.tar.bz2
scala-08f096df8c8fd85f92ee75bcc6c3a5082e0f4a90.zip
fixed ticket #136 (charSeq)
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/util/parsing/json/Lexer.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/util/parsing/json/Lexer.scala b/src/library/scala/util/parsing/json/Lexer.scala
index 289551fe0b..c44e290797 100644
--- a/src/library/scala/util/parsing/json/Lexer.scala
+++ b/src/library/scala/util/parsing/json/Lexer.scala
@@ -43,7 +43,7 @@ class Lexer extends StdLexical with ImplicitConversions {
/** A string is a collection of zero or more Unicode characters, wrapped in
* double quotes, using backslash escapes (cf. http://www.json.org/).
*/
- def string = '\"' ~ rep(chrExcept('\"', '\n', EofCh)) ~ '\"' ^^ { _ mkString "" }
+ def string = '\"' ~ rep(charSeq | chrExcept('\"', '\n', EofCh)) ~ '\"' ^^ { _ mkString "" }
override def whitespace = rep(whitespaceChar)