extmod, ujson: Add test and comment for loads.

dpgeorge · dpgeorge · commit 2c180f7ccc45 · 2014-09-21T23:43:03.000+01:00
diff --git a/extmod/modujson.c b/extmod/modujson.c
@@ -49,13 +49,26 @@ STATIC mp_obj_t mod_ujson_dumps(mp_obj_t obj) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_dumps_obj, mod_ujson_dumps);
 
+// This function implements a simple non-recursive JSON parser.
+//
+// The JSON specification is at http://www.ietf.org/rfc/rfc4627.txt
+// The parser here will parse any valid JSON and return the correct
+// corresponding Python object.  It allows through a superset of JSON, since
+// it treats commas and colons as "whitespace", and doesn't care if
+// brackets/braces are correctly paired.  It will raise a ValueError if the
+// input is outside it's specs.
+//
+// Most of the work is parsing the primitives (null, false, true, numbers,
+// strings).  It does 1 pass over the input string and so is easily extended to
+// being able to parse from a non-seekable stream.  It tries to be fast and
+// small in code size, while not using more RAM than necessary.
 STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) {
     mp_uint_t len;
     const char *s = mp_obj_str_get_data(obj, &len);
     const char *top = s + len;
     vstr_t vstr;
     vstr_init(&vstr, 8);
-    mp_obj_list_t stack;
+    mp_obj_list_t stack; // we use a list as a simple stack for nested JSON
     stack.len = 0;
     stack.items = NULL;
     mp_obj_t stack_top = MP_OBJ_NULL;
diff --git a/tests/extmod/ujson_loads.py b/tests/extmod/ujson_loads.py
@@ -0,0 +1,30 @@
+try:
+    import ujson as json
+except:
+    import json
+
+def my_print(o):
+    if isinstance(o, dict):
+        print('sorted dict', sorted(o.items()))
+    else:
+        print(o)
+
+my_print(json.loads('null'))
+my_print(json.loads('false'))
+my_print(json.loads('true'))
+my_print(json.loads('1'))
+my_print(json.loads('1.2'))
+my_print(json.loads('1e2'))
+my_print(json.loads('-2'))
+my_print(json.loads('-2.3'))
+my_print(json.loads('-2e3'))
+my_print(json.loads('-2e-3'))
+my_print(json.loads('"abc\\u0064e"'))
+my_print(json.loads('[]'))
+my_print(json.loads('[null]'))
+my_print(json.loads('[null,false,true]'))
+my_print(json.loads(' [ null , false , true ] '))
+my_print(json.loads('{}'))
+my_print(json.loads('{"a":true}'))
+my_print(json.loads('{"a":null, "b":false, "c":true}'))
+my_print(json.loads('{"a":[], "b":[1], "c":{"3":4}}'))
