Simplification and introduction of top-level JSON array support.

Closes #10
TeskaLabs · Apr 6, 2021 · 3305336 · 3305336
1 parent 00fbdb5
commit 3305336
Show file tree

Hide file tree

Showing 8 changed files with 184 additions and 202 deletions.
diff --git a/cysimdjson/cysimdjson.pyx b/cysimdjson/cysimdjson.pyx
diff --git a/cysimdjson/jsoninter.h b/cysimdjson/jsoninter.h
@@ -3,16 +3,9 @@
 
 using namespace simdjson;
 
-// To avoid naming collisions between dom::object and python namespace
-using simdjson_object = dom::object;
-using simdjson_element_type = dom::element_type;
-using simdjson_element = dom::element;
-using simdjson_array = dom::array;
-using simdjson_parser = dom::parser;
 
-
-inline int getitem_from_element(dom::element & element, const std::string & key, dom::element & value) {
-	auto error = element[key].get(value);
+inline int getitem_from_object(dom::object & obj, const std::string & key, dom::element & value) {
+	auto error = obj[key].get(value);
 	if (error) {
 		return -1;
 	}
@@ -30,8 +23,8 @@ inline int getitem_from_array(dom::array & array, int key, dom::element & value)
 }
 
 
-inline int at_pointer_element(dom::element & element, std::string & key, dom::element & value) {
-	auto error = element.at_pointer(key).get(value);
+inline int at_pointer_object(dom::object & obj, std::string & key, dom::element & value) {
+	auto error = obj.at_pointer(key).get(value);
 	if (error) {
 		return -1;
 	}

diff --git a/cysimdjson/ondemand/README.md b/cysimdjson/ondemand/README.md
diff --git a/cysimdjson/ondemand/jsoninter.h b/cysimdjson/ondemand/jsoninter.h
diff --git a/cysimdjson/ondemand/simdjsonpy.pyx b/cysimdjson/ondemand/simdjsonpy.pyx
diff --git a/cysimdjson/pysimdjson/errors.cpp b/cysimdjson/pysimdjson/errors.cpp
@@ -11,8 +11,7 @@
  *
  *      simd_element at(int) except +simdjson_error_handler
  */
-void
-simdjson_error_handler() {
+void simdjson_error_handler() {
     using namespace simdjson;
 
     try {

diff --git a/test/test_array/__init__.py b/test/test_array/__init__.py
@@ -8,6 +8,7 @@
 
 class JSONArrayTestCases(unittest.TestCase):
 
+
 	def test_iter_01(self):
 
 		parser = cysimdjson.JSONParser()
@@ -19,3 +20,14 @@ def test_iter_01(self):
 		self.assertEqual(len(ar), 10)
 		for i, n in enumerate(ar, 1):
 			self.assertEqual(i, n)
+
+
+	def test_iter_02(self):
+
+		parser = cysimdjson.JSONParser()
+
+		with open(os.path.join(THIS_DIR, 'top_array.json'), 'rb') as fo:
+			json_parsed = parser.parse(fo.read())
+
+		for i, n in enumerate(json_parsed, 1):
+			self.assertEqual(i, n)
diff --git a/test/test_array/top_array.json b/test/test_array/top_array.json
@@ -0,0 +1 @@
+[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]