csonpath 0.13.0__tar.gz → 0.13.1__tar.gz

{csonpath-0.13.0 → csonpath-0.13.1}/Makefile

@@ -3,7 +3,7 @@ JSON_C_LDFLAGS=$(shell pkg-config --libs json-c)
 
 include config.mk
 
-all: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root
+all: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index
 
 bench:
 	make -C bench
@@ -30,12 +30,20 @@ test-json-filter: tests/json-c/filter.c csonpath_json-c.h csonpath.h csonpath_do
 test-json-subpath: tests/json-c/subpath.c csonpath_json-c.h csonpath.h csonpath_do.h
 	$(CC) tests/json-c/subpath.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-subpath  $(JSON_C_LDFLAGS) $(LDFLAGS)
 
-tests-c: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root
+test-json-filter-and-missing-key: tests/json-c/filter-and-missing-key.c csonpath_json-c.h csonpath.h csonpath_do.h
+	$(CC) tests/json-c/filter-and-missing-key.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-filter-and-missing-key  $(JSON_C_LDFLAGS) $(LDFLAGS)
+
+test-json-get-array-big-index: tests/json-c/get-array-big-index.c csonpath_json-c.h csonpath.h csonpath_do.h
+	$(CC) tests/json-c/get-array-big-index.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-get-array-big-index  $(JSON_C_LDFLAGS) $(LDFLAGS)
+
+tests-c: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index
 	./test-json-c-get-a
 	./test-json-update
 	./test-json-filter
 	./test-json-subpath
 	./test-json-c-array-root
+	./test-json-filter-and-missing-key
+	./test-json-get-array-big-index
 
 pip-dev:
 	pip install -e .[dev] --force-reinstall
@@ -46,5 +54,5 @@ tests-py: pip-dev
 tests: tests-py tests-c
 
 clean:
-	rm -rvf test-json-c-get-a test-json-update test-json-filter test-json-subpath
+	rm -rvf test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index
 

{csonpath-0.13.0/csonpath.egg-info → csonpath-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csonpath
-Version: 0.13.0
+Version: 0.13.1
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev

{csonpath-0.13.0 → csonpath-0.13.1/csonpath.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csonpath
-Version: 0.13.0
+Version: 0.13.1
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev

{csonpath-0.13.0 → csonpath-0.13.1}/csonpath_do.h

@@ -161,7 +161,7 @@ static CSONPATH_DO_RET_TYPE csonpath_do_dotdot(const struct csonpath cjp[const s
 		CSONPATH_DO_FIND_ALL;
 	    }
 	}
-    } else {
+    } else if (CSONPATH_IS_ARRAY(tmp)) {
 	CSONPATH_FOREACH_ARRAY(tmp, el, key_idx) {
 	    CSONPATH_DO_FOREACH_PRE_SET;
 	    if (CSONPATH_IS_OBJ(el) || CSONPATH_IS_ARRAY(el)) {
@@ -212,9 +212,15 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
 
 	    (void) foreach_idx;
 	    CSONPATH_DO_FILTER_PRE_LOOP;
+	    if (!CSONPATH_IS_ARRAY(tmp)) {
+		CSONPATH_DO_FILTER_OUT;
+		break;
+	    }
 	    CSONPATH_FOREACH_ARRAY(tmp, el, foreach_idx)
 	    {
 		intptr_t key_idx = foreach_idx;
+		filter_next = filter_next_in;
+		operation = operation_in;
 		(void)key_idx;
 		owalker = next;
 	      match_and_or_or:
@@ -226,7 +232,7 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
 
 		    if (csonpath_make_match(cjp, origin, el2, &owalker, operation)) {
 			if (*owalker == CSONPATH_INST_FILTER_AND) {
-			    ++owalker; /* skip next */
+			    ++owalker; /* skip and */
 			    operation = *owalker;
 			    ++owalker;
 			    filter_next = *owalker;
@@ -237,9 +243,6 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
 			    csonpath_do_internal(cjp, origin, el, tmp, owalker
 						 CSONPATH_DO_EXTRA_ARGS_NEESTED);
 			CSONPATH_DO_FILTER_FIND;
-		    } else {
-			operation = operation_in;
-			filter_next = filter_next_in;
 		    }
 		}
 	    }
@@ -385,7 +388,7 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
 		this_idx = to_num.n;
 		CSONPATH_PRE_GET(this_idx);
 		tmp = CSONPATH_AT(tmp, to_num.n);
-		walker += 5;
+		walker += 4;
 		if (tmp == CSONPATH_NULL) {
 		    CSONPATH_DO_GET_NOTFOUND(this_idx);
 		}

{csonpath-0.13.0 → csonpath-0.13.1}/csonpath_python.c

@@ -264,6 +264,8 @@ static PyObject *find_all(PyCsonPathObject *self, PyObject* args)
         BAD_ARG();
 
     PyObject *ret = csonpath_find_all(self->cp, json);
+    if (PyErr_Occurred())
+        return NULL;
 
     return ret;
 }
@@ -276,6 +278,8 @@ static PyObject *find_first(PyCsonPathObject *self, PyObject* args)
         BAD_ARG();
 
     PyObject *ret = csonpath_find_first(self->cp, json);
+    if (PyErr_Occurred())
+        return NULL;
 
     Py_INCREF(ret);
     return ret;
@@ -284,7 +288,7 @@ static PyObject *find_first(PyCsonPathObject *self, PyObject* args)
 static PyObject *print_instructions(PyCsonPathObject *self, PyObject *args, PyObject *kwds)
 {
     csonpath_print_instruction(self->cp);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyObject *callback(PyCsonPathObject *self, PyObject* args)
@@ -294,6 +298,8 @@ static PyObject *callback(PyCsonPathObject *self, PyObject* args)
     if (!PyArg_ParseTuple(args, "OO|O", &json, &callback, &udata))
 	BAD_ARG();
     int ret = csonpath_callback(self->cp, json, callback, udata);
+    if (PyErr_Occurred())
+        return NULL;
     return PyLong_FromLong(ret);
 }
 
@@ -304,6 +310,8 @@ static PyObject *do_remove(PyCsonPathObject *self, PyObject* args)
   if (!PyArg_ParseTuple(args, "O", &json))
     BAD_ARG();
   int ret = csonpath_remove(self->cp, json);
+  if (PyErr_Occurred())
+      return NULL;
   return PyLong_FromLong(ret);
 }
 
@@ -315,7 +323,7 @@ static PyObject *update_or_create(PyCsonPathObject *self, PyObject* args)
   if (!PyArg_ParseTuple(args, "OO", &json, &value))
       BAD_ARG();
   int ret = csonpath_update_or_create(self->cp, json, value);
-  if (ret < 0) {
+  if (PyErr_Occurred() || ret < 0) {
       return NULL;
   }
   return PyLong_FromLong(ret);
@@ -328,6 +336,9 @@ static PyObject *update_or_create_callback(PyCsonPathObject *self, PyObject* arg
     if (!PyArg_ParseTuple(args, "OO|O", &json, &callback, &udata))
 	BAD_ARG();
     int ret = csonpath_update_or_create_callback(self->cp, json, callback, udata);
+    if (PyErr_Occurred() || ret < 0) {
+        return NULL;
+    }
     return PyLong_FromLong(ret);
 }
 

{csonpath-0.13.0 → csonpath-0.13.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "csonpath"
-version = "0.13.0"
+version = "0.13.1"
 readme = "README.md"
 
 [tool.setuptools]
@@ -27,7 +27,7 @@ test-command = "pytest {project}/tests/python"
 before-build = "choco install mingw -y"
 
 [tool.bumpversion]
-current_version = "0.13.0"
+current_version = "0.13.1"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"