csonpath 0.12.0__tar.gz → 0.13.0__tar.gz

{csonpath-0.12.0 → csonpath-0.13.0}/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
+all: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root
 
 bench:
 	make -C bench
@@ -18,6 +18,9 @@ CFLAGS+= -Wall -Wextra -Wno-unused-function -Wno-unused-parameter -O0 -g
 test-json-c-get-a: tests/json-c/get-a.c $(EXTRA_FILES) csonpath_json-c.h csonpath.h csonpath_do.h
 	$(CC) tests/json-c/get-a.c  $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-c-get-a  $(JSON_C_LDFLAGS) $(LDFLAGS)
 
+test-json-c-array-root: tests/json-c/root-array.c $(EXTRA_FILES) csonpath_json-c.h csonpath.h csonpath_do.h
+	$(CC) tests/json-c/root-array.c  $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-c-array-root  $(JSON_C_LDFLAGS) $(LDFLAGS)
+
 test-json-update: tests/json-c/set-a.c csonpath_json-c.h csonpath.h csonpath_do.h
 	$(CC) tests/json-c/set-a.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-update  $(JSON_C_LDFLAGS) $(LDFLAGS)
 
@@ -27,11 +30,12 @@ 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
+tests-c: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root
 	./test-json-c-get-a
 	./test-json-update
 	./test-json-filter
 	./test-json-subpath
+	./test-json-c-array-root
 
 pip-dev:
 	pip install -e .[dev] --force-reinstall

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

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

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

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

{csonpath-0.12.0 → csonpath-0.13.0}/csonpath.h

@@ -918,9 +918,9 @@ need_reloop_in = 0;
 #define CSONPATH_NONE_FOUND_RET CSONPATH_NULL
 
 #define CSONPATH_GETTER_ERR(args...) do {	\
-		fprintf(stderr, args);		\
-		return CSONPATH_NULL;		\
-	} while (0)
+	CSONPATH_FORMAT_EXCEPTION(args);	\
+	return CSONPATH_NULL;			\
+    } while (0)
 
 /* Find First */
 
@@ -980,10 +980,10 @@ need_reloop_in = 0;
 
 #define CSONPATH_NONE_FOUND_RET 0
 
-#define CSONPATH_GETTER_ERR(args...) do {	\
-		fprintf(stderr, args);		\
-		return -1;			\
-	} while (0)
+#define CSONPATH_GETTER_ERR(args...) do {		\
+	CSONPATH_FORMAT_EXCEPTION(args);		\
+	return -1;					\
+    } while (0)
 
 #define CSONPATH_DO_ON_FOUND
 
@@ -1104,7 +1104,8 @@ static int csonpath_sync_root_array(CSONPATH_JSON parent, CSONPATH_JSON to_updat
 
     CSONPATH_ARRAY_CLEAR(parent);
     CSONPATH_FOREACH_ARRAY(to_update, child, idx) {
-	CSONPATH_APPEND_AT(parent, idx, child);
+	if (CSONPATH_APPEND_AT(parent, idx, child) < 0)
+	    return -1;
     }
     return 1;
 }
@@ -1116,7 +1117,8 @@ static int csonpath_sync_root_obj(CSONPATH_JSON parent, CSONPATH_JSON to_update)
 
     CSONPATH_OBJ_CLEAR(parent);
     CSONPATH_FOREACH_OBJ(to_update, child, key) {
-	CSONPATH_APPEND_AT(parent, key, child);
+	if (CSONPATH_APPEND_AT(parent, key, child) < 0)
+	    return -1;
     }
     return 1;
 }
@@ -1129,7 +1131,7 @@ static int csonpath_sync_root_obj(CSONPATH_JSON parent, CSONPATH_JSON to_update)
 	} else if (CSONPATH_IS_ARRAY(origin) && CSONPATH_IS_ARRAY(to_update)) { \
 	    return csonpath_sync_root_array(origin, to_update);		\
 	} else {							\
-	    CSONPATH_EXCEPTION("can't upate root ($)\n");		\
+	    CSONPATH_EXCEPTION("can't update root ($)\n");		\
 	}								\
     }
 
@@ -1141,7 +1143,7 @@ static int csonpath_sync_root_obj(CSONPATH_JSON parent, CSONPATH_JSON to_update)
 	to_check = *check_at;						\
     } while (to_check == CSONPATH_INST_GET_ALL || to_check == CSONPATH_INST_FIND_ALL); \
     if (to_check == CSONPATH_INST_END || to_check == CSONPATH_INST_OR) { \
-	CSONPATH_APPEND_AT(ctx, this_idx, to_update);			\
+	if (CSONPATH_APPEND_AT(ctx, this_idx, to_update) < 0) return -1; \
 	return 1;							\
     }
 
@@ -1215,7 +1217,7 @@ static int csonpath_sync_root_obj(CSONPATH_JSON parent, CSONPATH_JSON to_update)
 #define CSONPATH_PRE_GET_ROOT						\
     int to_check = *walker;						\
     if (to_check == CSONPATH_INST_END || to_check == CSONPATH_INST_OR)  { \
-	CSONPATH_GETTER_ERR("can't upate root ($)\n");			\
+	CSONPATH_GETTER_ERR("can't update root ($)\n");			\
 	return CSONPATH_NONE_FOUND_RET;					\
     }
 

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

@@ -1,7 +1,7 @@
 #ifndef CSONPATH_DO_GET_NOTFOUND
 #define CSONPATH_DO_GET_NOTFOUND(this_idx)				\
-    do {								\
-	walker += 1;							\
+  do {									\
+      walker += 1;							\
 	while (*walker != CSONPATH_INST_END) {				\
 	    if (*walker == CSONPATH_INST_OR) {				\
 		goto next_inst;						\
@@ -369,10 +369,10 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
 	    this_idx =  (int)walker[1];
 	    CSONPATH_PRE_GET(this_idx);
 	    tmp = CSONPATH_AT(tmp, this_idx);
+	    walker += 1;
 	    if (tmp == CSONPATH_NULL) {
 		CSONPATH_DO_GET_NOTFOUND(this_idx);
 	    }
-	    walker += 1;
 	    CSONPATH_DO_POST_FIND_ARRAY;
 	    break;
 	}
@@ -385,10 +385,10 @@ 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;
 		if (tmp == CSONPATH_NULL) {
 		    CSONPATH_DO_GET_NOTFOUND(this_idx);
 		}
-		walker += 5;
 		CSONPATH_DO_POST_FIND_ARRAY;
 		break;
 	    }

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

@@ -313,10 +313,11 @@ static PyObject *update_or_create(PyCsonPathObject *self, PyObject* args)
   PyObject *value;
 
   if (!PyArg_ParseTuple(args, "OO", &json, &value))
-    BAD_ARG();
+      BAD_ARG();
   int ret = csonpath_update_or_create(self->cp, json, value);
-  if (ret < 0)
+  if (ret < 0) {
       return NULL;
+  }
   return PyLong_FromLong(ret);
 }
 

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "csonpath"
-version = "0.12.0"
+version = "0.13.0"
 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.12.0"
+current_version = "0.13.0"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"