correctly parse empty strings

stevej · Sep 2, 2010 · e0b55b6 · e0b55b6
1 parent 18f3079
commit e0b55b6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/project/build.properties b/project/build.properties
@@ -3,7 +3,7 @@
 project.organization=com.twitter
 project.name=json
 sbt.version=0.7.4
-project.version=1.1.5
+project.version=1.1.6
 def.scala.version=2.7.7
 build.scala.versions=2.7.7
 project.initialize=false
diff --git a/src/main/scala/com/twitter/json/Json.scala b/src/main/scala/com/twitter/json/Json.scala
@@ -88,7 +88,7 @@ private class JsonParser extends JavaTokenParsers {
   lazy val stringParser = (new EscapedStringParser)
 
   def string: Parser[String] =
-    "\"" ~> """(\\"|[^"])+""".r <~ "\"" ^^ { escapedStr =>
+    "\"" ~> """(\\"|[^"])*""".r <~ "\"" ^^ { escapedStr =>
       stringParser.parse(escapedStr)
     }
 

diff --git a/src/test/scala/com/twitter/json/JsonSpec.scala b/src/test/scala/com/twitter/json/JsonSpec.scala
@@ -59,6 +59,10 @@ object JsonSpec extends Specification {
           List("hi\njerk")
       }
 
+      "empty string" in {
+        Json.parse("""[""]""") mustEqual List("")
+      }
+
       "quoted quote" in {
         Json.parse("""["x\"x"]""") mustEqual
           List("x\"x")