Tests and conformance for Arrays.

Author: eggpi

jsonfsm.py

@@ -217,11 +217,11 @@ def array_fsm():
     if c != '[':
         raise JSONParseError("Arrays must begin with [")
 
-    while c != ']':
+    c = (yield NOT_PARSED_YET)
+    while c.isspace():
         c = (yield NOT_PARSED_YET)
-        while c.isspace():
-            c = (yield NOT_PARSED_YET)
 
+    while c != ']':
         vp = value_fsm()
         value = NOT_PARSED_YET
 
@@ -233,6 +233,16 @@ def array_fsm():
                 while c.isspace():
                     c = (yield NOT_PARSED_YET)
 
+        # if we stopped at a , advance until the start of the next value
+        # (and raise exception if the array ends)
+        if c == ',':
+            c = (yield NOT_PARSED_YET)
+            while c.isspace():
+                c = (yield NOT_PARSED_YET)
+
+            if c == ']':
+                raise JSONParseError("Extra , before ] in array")
+
         array.append(value)
 
     yield array

test.py

@@ -80,5 +80,30 @@ def test_invalid_numbers(self):
                               jsonfsm.loads,
                               invalid)
 
+class TestArray(unittest.TestCase):
+    def setUp(self):
+        self.valid = (
+            ('[]', []),
+            ("[1]", [1.0]),
+            ("[ 1,   2,  3]", [1.0, 2.0, 3.0]),
+            ('[   "a string with ]"]', [u"a string with ]"]),
+            ('[ ["nested array"], 1]', [[u"nested array"], 1.0]),
+        )
+
+        self.invalid = (
+            "[,]",
+            "[1,]",
+        )
+
+    def test_valid_arrays(self):
+        for json, expected in self.valid:
+            self.assertEquals(jsonfsm.loads(json), expected)
+
+    def test_invalid_arrays(self):
+        for json in self.invalid:
+            self.assertRaises(jsonfsm.JSONParseError,
+                              jsonfsm.loads,
+                              json)
+
 if __name__ == "__main__":
     unittest.main()