Added the ability to parse json primitives at the top level

frj · Nov 19, 2012 · c8f7985 · c8f7985 · jonifreeman · Nov 20, 2012
1 parent 3f59efc
commit c8f7985
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/core/json/src/main/scala/net/liftweb/json/JsonParser.scala b/core/json/src/main/scala/net/liftweb/json/JsonParser.scala
@@ -169,13 +169,16 @@ object JsonParser {
     }
 
     def newValue(v: JValue) {
-      vals.peek(classOf[JValue]) match {
-        case f: JField =>
+      vals.peekOption match {
+        case Some(f: JField) =>
           vals.pop(classOf[JField])
           val newField = JField(f.name, v)
           val obj = vals.peek(classOf[JObject])
           vals.replace(JObject(newField :: obj.obj))
-        case a: JArray => vals.replace(JArray(v :: a.arr))
+        case Some(a: JArray) => vals.replace(JArray(v :: a.arr))
+        case None =>
+          vals.push(v)
+          root = Some(v)
         case _ => p.fail("expected field or array")
       }
     }

diff --git a/core/json/src/test/scala/net/liftweb/json/JsonParserSpec.scala b/core/json/src/test/scala/net/liftweb/json/JsonParserSpec.scala
@@ -31,7 +31,7 @@ object JsonParserSpec extends Specification with JValueGen with ScalaCheck {
 
   "Any valid json can be parsed" in {
     val parsing = (json: JValue) => { parse(Printer.pretty(render(json))); true }
-    check(forAll(parsing))
+    check(forAll(genJValue)(parsing))
   }
 
   "Buffer size does not change parsing result" in {