diff options
| author | Geoffrey Washburn <geoffrey.washburn@epfl.ch> | 2008-01-09 11:46:46 +0000 |
|---|---|---|
| committer | Geoffrey Washburn <geoffrey.washburn@epfl.ch> | 2008-01-09 11:46:46 +0000 |
| commit | 064ff0081d0025b6f065ee5e1e2dbdcb0f593cbd (patch) | |
| tree | 4aea7bd71d4d6874b59d2fd6fbb48704caf58617 | |
| parent | 13148cc2ae9f9f875987f986d831057d8687d194 (diff) | |
| download | scala-064ff0081d0025b6f065ee5e1e2dbdcb0f593cbd.tar.gz scala-064ff0081d0025b6f065ee5e1e2dbdcb0f593cbd.tar.bz2 scala-064ff0081d0025b6f065ee5e1e2dbdcb0f593cbd.zip | |
Applied patch from Ticket #330.
Fixed the parsing of 0 by the JSON library.
| -rw-r--r-- | src/library/scala/util/parsing/json/Lexer.scala | 2 | ||||
| -rw-r--r-- | test/files/run/json.check | 1 | ||||
| -rw-r--r-- | test/files/run/json.scala | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/library/scala/util/parsing/json/Lexer.scala b/src/library/scala/util/parsing/json/Lexer.scala index c44e290797..143871c8da 100644 --- a/src/library/scala/util/parsing/json/Lexer.scala +++ b/src/library/scala/util/parsing/json/Lexer.scala @@ -62,7 +62,7 @@ class Lexer extends StdLexical with ImplicitConversions { case None => "" } - def zero: Parser[String] = '0' ^^ toString + def zero: Parser[String] = '0' ^^ "0" def nonzero = elem("nonzero digit", d => d.isDigit && d != '0') def exponent = elem("exponent character", d => d == 'e' || d == 'E') def sign = elem("sign character", d => d == '-' || d == '+') diff --git a/test/files/run/json.check b/test/files/run/json.check index a6495477ac..a735624221 100644 --- a/test/files/run/json.check +++ b/test/files/run/json.check @@ -2,6 +2,7 @@ Some(List((name,value))) Some(List((name,va1ue))) Some(List((name,List((name1,va1ue1), (name2,va1ue2))))) Some(List((name,"))) +Some(List((age,0.0))) Some(List((firstName,John), (lastName,Smith), (address,List((streetAddress,21 2nd Street), (city,New York), (state,NY), (postalCode,10021.0))), (phoneNumbers,List(212 732-1234, 646 123-4567)))) diff --git a/test/files/run/json.scala b/test/files/run/json.scala index f528eaf5fe..ec0bad7ebe 100644 --- a/test/files/run/json.scala +++ b/test/files/run/json.scala @@ -8,6 +8,7 @@ object Test extends Application { printJSON("{\"name\": \"va1ue\"}") // ticket #136 printJSON("{\"name\": { \"name1\": \"va1ue1\", \"name2\": \"va1ue2\" } }") printJSON("{\"name\": \"\\u0022\"}") + printJSON("{\"age\": 0}") println // from http://en.wikipedia.org/wiki/JSON |